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

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

@@ -1,10 +1,13 @@
-import { type SchemaMergeContext } from "./SchemaMerger";
-import { type SchemaReferenceDifference } from "../Differencing/SchemaDifference";
+import type { SchemaMergeContext } from "./SchemaMerger";
+import type { SchemaReferenceDifference } from "../Differencing/SchemaDifference";
 /**
- * Merges the schema references of two schemas.
- * @param context  current merge context
- * @param change       schema changes.
+ * Merges a new reference to an external schema into the target schema.
  * @internal
  */
-export declare function mergeSchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference): Promise<void>;
+export declare function addSchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference): Promise<void>;
+/**
+ * Merges differences to an existing schema references in the target schema.
+ * @internal
+ */
+export declare function modifySchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference): Promise<void>;
 //# sourceMappingURL=SchemaReferenceMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaReferenceMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAGlF;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,yBAAyB,iBA8BzG"}
+{"version":3,"file":"SchemaReferenceMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAIlF;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,yBAAyB,iBAGvG;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,yBAAyB,iBAgB1G"}

package/lib/cjs/Merging/SchemaReferenceMerger.js

@@ -1,44 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSchemaReferences = void 0;
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+exports.modifySchemaReferences = exports.addSchemaReferences = void 0;
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 /**
- * Merges the schema references of two schemas.
- * @param context  current merge context
- * @param change       schema changes.
+ * Merges a new reference to an external schema into the target schema.
  * @internal
  */
-async function mergeSchemaReferences(context, change) {
-    // If the target schema does not have a reference to a schema yet, it can be added
-    // but should be checked if it's schema references have collisions with existing references.
-    if (change.changeType === "add") {
-        const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);
-        await context.editor.addSchemaReference(context.targetSchemaKey, referencedSchema);
+async function addSchemaReferences(context, change) {
+    const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);
+    await context.editor.addSchemaReference(context.targetSchemaKey, referencedSchema);
+}
+exports.addSchemaReferences = addSchemaReferences;
+/**
+ * Merges differences to an existing schema references in the target schema.
+ * @internal
+ */
+async function modifySchemaReferences(context, change) {
+    const existingSchema = await context.targetSchema.getReference(change.difference.name);
+    const [older, latest] = sortSchemas(existingSchema.schemaKey, new ecschema_metadata_1.SchemaKey(change.difference.name, ecschema_metadata_1.ECVersion.fromString(change.difference.version)));
+    if (latest === existingSchema.schemaKey) {
+        return;
     }
-    // If the source schema referenced a schema that is also referenced by the target
-    // schema but in a different version, it is marked as delta. Here we need to check if
-    // the source schema is compatible to the existing one. This is not be checked by the
-    // schema instance when added.
-    if (change.changeType === "modify") {
-        const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);
-        const existingSchema = (await context.targetSchema.getReference(referencedSchema.name));
-        const [older, latest] = compareSchemas(existingSchema, referencedSchema);
-        if (!latest.schemaKey.matches(older.schemaKey, ecschema_metadata_1.SchemaMatchType.LatestWriteCompatible)) {
-            throw new Error(`Schemas references of ${referencedSchema.name} have incompatible versions: ${older.schemaKey.version} and ${latest.schemaKey.version}`);
-        }
-        if (latest === existingSchema) {
-            return;
-        }
-        const index = context.targetSchema.references.findIndex((reference) => reference === existingSchema);
-        context.targetSchema.references.splice(index, 1);
-        await context.editor.addSchemaReference(context.targetSchema.schemaKey, referencedSchema);
+    if (!latest.matches(older, ecschema_metadata_1.SchemaMatchType.LatestWriteCompatible)) {
+        throw new Error(`Schemas references of ${change.difference.name} have incompatible versions: ${older.version} and ${latest.version}`);
     }
+    const index = context.targetSchema.references.findIndex((reference) => reference === existingSchema);
+    context.targetSchema.references.splice(index, 1);
+    const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);
+    await context.editor.addSchemaReference(context.targetSchema.schemaKey, referencedSchema);
 }
-exports.mergeSchemaReferences = mergeSchemaReferences;
+exports.modifySchemaReferences = modifySchemaReferences;
 /**
  * Tries to locate the Schema in the current Context
  * @param editor      Current editor context.
@@ -58,13 +49,13 @@ async function locateSchema(editor, schemaName, version) {
     return schema;
 }
 /**
- * Compares the schemas and return them in order of their versions [older, latest].
- * @param left    The first schema to be added.
- * @param right   The second schema to be added.
+ * Sorts the schemas and return them in order of their versions [older, latest].
+ * @param left    The first schema key to be added.
+ * @param right   The second schema key to be added.
  * @returns       The schemas in order.
  */
-function compareSchemas(left, right) {
-    return left.schemaKey.compareByVersion(right.schemaKey) < 0
+function sortSchemas(left, right) {
+    return left.compareByVersion(right) < 0
         ? [left, right]
         : [right, left];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaReferenceMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.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 { ECVersion, Schema, SchemaKey, SchemaMatchType } from \"@itwin/ecschema-metadata\";\r\nimport { type SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { type SchemaReferenceDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaContextEditor } from \"../Editing/Editor\";\r\n\r\n/**\r\n * Merges the schema references of two schemas.\r\n * @param context  current merge context\r\n * @param change       schema changes.\r\n * @internal\r\n */\r\nexport async function mergeSchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference) {\r\n  // If the target schema does not have a reference to a schema yet, it can be added\r\n  // but should be checked if it's schema references have collisions with existing references.\r\n  if(change.changeType === \"add\") {\r\n    const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);\r\n    await context.editor.addSchemaReference(context.targetSchemaKey, referencedSchema);\r\n  }\r\n\r\n  // If the source schema referenced a schema that is also referenced by the target\r\n  // schema but in a different version, it is marked as delta. Here we need to check if\r\n  // the source schema is compatible to the existing one. This is not be checked by the\r\n  // schema instance when added.\r\n  if(change.changeType === \"modify\") {\r\n    const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);\r\n    const existingSchema  = (await context.targetSchema.getReference(referencedSchema.name))!;\r\n\r\n    const [older, latest] = compareSchemas(existingSchema, referencedSchema);\r\n    if(!latest.schemaKey.matches(older.schemaKey, SchemaMatchType.LatestWriteCompatible)) {\r\n      throw new Error(`Schemas references of ${referencedSchema.name} have incompatible versions: ${older.schemaKey.version} and ${latest.schemaKey.version}`);\r\n    }\r\n\r\n    if(latest === existingSchema) {\r\n      return;\r\n    }\r\n\r\n    const index = context.targetSchema.references.findIndex((reference) => reference === existingSchema);\r\n    context.targetSchema.references.splice(index, 1);\r\n\r\n    await context.editor.addSchemaReference(context.targetSchema.schemaKey, referencedSchema);\r\n  }\r\n}\r\n\r\n/**\r\n * Tries to locate the Schema in the current Context\r\n * @param editor      Current editor context.\r\n * @param schemaName  The schema name to be looked up.\r\n * @param version     The schemas version to beo looked up.\r\n * @returns           The schema found in the context.\r\n */\r\nasync function locateSchema(editor: SchemaContextEditor, schemaName?: string, version?: string): Promise<Schema> {\r\n  if(schemaName === undefined || version === undefined) {\r\n    throw new Error(\"Schema name and version must not be undefined.\");\r\n  }\r\n\r\n  const schemaKey = new SchemaKey(schemaName, ECVersion.fromString(version));\r\n  const schema = await editor.schemaContext.getSchema(schemaKey, SchemaMatchType.LatestWriteCompatible);\r\n  if(schema === undefined) {\r\n    throw new Error(`Referenced schema ${schemaKey.toString()} could not be found in target context`);\r\n  }\r\n  return schema;\r\n}\r\n\r\n/**\r\n * Compares the schemas and return them in order of their versions [older, latest].\r\n * @param left    The first schema to be added.\r\n * @param right   The second schema to be added.\r\n * @returns       The schemas in order.\r\n */\r\nfunction compareSchemas(left: Schema, right: Schema): [Schema, Schema] {\r\n  return left.schemaKey.compareByVersion(right.schemaKey) < 0\r\n    ? [left, right]\r\n    : [right, left];\r\n}\r\n"]}
+{"version":3,"file":"SchemaReferenceMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.ts"],"names":[],"mappings":";;;AAOA,gEAAyF;AAEzF;;;GAGG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAA2B,EAAE,MAAiC;IACtG,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/G,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AACrF,CAAC;AAHD,kDAGC;AAED;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAAC,OAA2B,EAAE,MAAiC;IACzG,MAAM,cAAc,GAAI,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAW,CAAC;IAClG,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,6BAAS,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,6BAAS,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACtJ,IAAG,MAAM,KAAK,cAAc,CAAC,SAAS,EAAE,CAAC;QACvC,OAAO;IACT,CAAC;IAED,IAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,mCAAe,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,UAAU,CAAC,IAAI,gCAAgC,KAAK,CAAC,OAAO,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACxI,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC;IACrG,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjD,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/G,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAC5F,CAAC;AAhBD,wDAgBC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,YAAY,CAAC,MAA2B,EAAE,UAAmB,EAAE,OAAgB;IAC5F,IAAG,UAAU,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,6BAAS,CAAC,UAAU,EAAE,6BAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,mCAAe,CAAC,qBAAqB,CAAC,CAAC;IACtG,IAAG,MAAM,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,SAAS,CAAC,QAAQ,EAAE,uCAAuC,CAAC,CAAC;IACpG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAAe,EAAE,KAAgB;IACpD,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC;QACrC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACf,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACpB,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport type { SchemaReferenceDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { SchemaContextEditor } from \"../Editing/Editor\";\r\nimport { ECVersion, Schema, SchemaKey, SchemaMatchType } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Merges a new reference to an external schema into the target schema.\r\n * @internal\r\n */\r\nexport async function addSchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference) {\r\n  const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);\r\n  await context.editor.addSchemaReference(context.targetSchemaKey, referencedSchema);\r\n}\r\n\r\n/**\r\n * Merges differences to an existing schema references in the target schema.\r\n * @internal\r\n */\r\nexport async function modifySchemaReferences(context: SchemaMergeContext, change: SchemaReferenceDifference) {\r\n  const existingSchema  = await context.targetSchema.getReference(change.difference.name) as Schema;\r\n  const [older, latest] = sortSchemas(existingSchema.schemaKey, new SchemaKey(change.difference.name, ECVersion.fromString(change.difference.version)));\r\n  if(latest === existingSchema.schemaKey) {\r\n    return;\r\n  }\r\n\r\n  if(!latest.matches(older, SchemaMatchType.LatestWriteCompatible)) {\r\n    throw new Error(`Schemas references of ${change.difference.name} have incompatible versions: ${older.version} and ${latest.version}`);\r\n  }\r\n\r\n  const index = context.targetSchema.references.findIndex((reference) => reference === existingSchema);\r\n  context.targetSchema.references.splice(index, 1);\r\n\r\n  const referencedSchema = await locateSchema(context.editor, change.difference.name, change.difference.version);\r\n  await context.editor.addSchemaReference(context.targetSchema.schemaKey, referencedSchema);\r\n}\r\n\r\n/**\r\n * Tries to locate the Schema in the current Context\r\n * @param editor      Current editor context.\r\n * @param schemaName  The schema name to be looked up.\r\n * @param version     The schemas version to beo looked up.\r\n * @returns           The schema found in the context.\r\n */\r\nasync function locateSchema(editor: SchemaContextEditor, schemaName?: string, version?: string): Promise<Schema> {\r\n  if(schemaName === undefined || version === undefined) {\r\n    throw new Error(\"Schema name and version must not be undefined.\");\r\n  }\r\n\r\n  const schemaKey = new SchemaKey(schemaName, ECVersion.fromString(version));\r\n  const schema = await editor.schemaContext.getSchema(schemaKey, SchemaMatchType.LatestWriteCompatible);\r\n  if(schema === undefined) {\r\n    throw new Error(`Referenced schema ${schemaKey.toString()} could not be found in target context`);\r\n  }\r\n  return schema;\r\n}\r\n\r\n/**\r\n * Sorts the schemas and return them in order of their versions [older, latest].\r\n * @param left    The first schema key to be added.\r\n * @param right   The second schema key to be added.\r\n * @returns       The schemas in order.\r\n */\r\nfunction sortSchemas(left: SchemaKey, right: SchemaKey): [SchemaKey, SchemaKey] {\r\n  return left.compareByVersion(right) < 0\r\n    ? [left, right]\r\n    : [right, left];\r\n}\r\n"]}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/StructClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG9D;;;GAGG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,qBAAqB,iBAK9F;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,aAAa,iBAGzH"}

package/lib/cjs/Merging/StructClassMerger.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyStructClass = exports.addStructClass = void 0;
+const ClassMerger_1 = require("./ClassMerger");
+/**
+ * Merges a new StructClass into the target schema.
+ * @internal
+ */
+async function addStructClass(context, change) {
+    await context.editor.structs.createFromProps(context.targetSchemaKey, {
+        name: change.itemName,
+        ...change.difference,
+    });
+}
+exports.addStructClass = addStructClass;
+/**
+ * Merges differences to an existing StructClass in the target schema.
+ * @internal
+ */
+async function modifyStructClass(context, change, itemKey) {
+    const item = await context.targetSchema.lookupItem(itemKey);
+    return (0, ClassMerger_1.modifyClass)(context, change, itemKey, item);
+}
+exports.modifyStructClass = modifyStructClass;
+//# sourceMappingURL=StructClassMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/StructClassMerger.ts"],"names":[],"mappings":";;;AAQA,+CAA4C;AAE5C;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAA6B;IAC7F,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACpE,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,GAAG,MAAM,CAAC,UAAU;KACrB,CAAC,CAAC;AACL,CAAC;AALD,wCAKC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAA6B,EAAE,OAAsB;IACxH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAiB,CAAC;IAC5E,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAHD,8CAGC","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 { StructClassDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { MutableClass } from \"../Editing/Mutable/MutableClass\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\n\r\n/**\r\n * Merges a new StructClass into the target schema.\r\n * @internal\r\n */\r\nexport async function addStructClass(context: SchemaMergeContext, change: StructClassDifference) {\r\n  await context.editor.structs.createFromProps(context.targetSchemaKey, {\r\n    name: change.itemName,\r\n    ...change.difference,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing StructClass in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyStructClass(context: SchemaMergeContext, change: StructClassDifference, itemKey: SchemaItemKey) {\r\n  const item = await context.targetSchema.lookupItem(itemKey) as MutableClass;\r\n  return modifyClass(context, change, itemKey, item);\r\n}\r\n"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"UnitSystemMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/UnitSystemMerger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CAgB1E,CAAC"}
+{"version":3,"file":"UnitSystemMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/UnitSystemMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;GAGG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,iBAM5F;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAOvH"}

package/lib/cjs/Merging/UnitSystemMerger.js

@@ -1,25 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unitSystemMerger = void 0;
+exports.modifyUnitSystem = exports.addUnitSystem = void 0;
 /**
- * Defines a merge handler to merge UnitSystem schema items.
+ * Merges a new UnitSystem into the target schema.
  * @internal
  */
-exports.unitSystemMerger = {
-    async add(context, change) {
-        return context.editor.unitSystems.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-        });
-    },
-    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);
-        }
-    },
-};
+async function addUnitSystem(context, change) {
+    await context.editor.unitSystems.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+    });
+}
+exports.addUnitSystem = addUnitSystem;
+/**
+ * Merges differences to an existing UnitSystem in the target schema.
+ * @internal
+ */
+async function modifyUnitSystem(context, change, itemKey) {
+    if (change.difference.label !== undefined) {
+        await context.editor.unitSystems.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.unitSystems.setDescription(itemKey, change.difference.description);
+    }
+}
+exports.modifyUnitSystem = modifyUnitSystem;
 //# sourceMappingURL=UnitSystemMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"UnitSystemMerger.js","sourceRoot":"","sources":["../../../src/Merging/UnitSystemMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,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;SAClC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAuB;QAC9D,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;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 MutableUnitSystem } from \"../Editing/Mutable/MutableUnitSystem\";\r\nimport { type SchemaItemMergerHandler } from \"./SchemaItemMerger\";\r\nimport { type UnitSystemDifference } from \"../Differencing/SchemaDifference\";\r\n\r\n/**\r\n * Defines a merge handler to merge UnitSystem schema items.\r\n * @internal\r\n */\r\nexport const unitSystemMerger: SchemaItemMergerHandler<UnitSystemDifference> = {\r\n  async add(context, change) {\r\n    return context.editor.unitSystems.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n    });\r\n  },\r\n  async modify(_context, change, _itemKey, item: MutableUnitSystem) {\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  },\r\n};\r\n"]}
+{"version":3,"file":"UnitSystemMerger.js","sourceRoot":"","sources":["../../../src/Merging/UnitSystemMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,OAA2B,EAAE,MAA4B;IAC3F,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;KAClC,CAAC,CAAC;AACL,CAAC;AAND,sCAMC;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,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;AACH,CAAC;AAPD,4CAOC","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 { UnitSystemDifference } 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 UnitSystem into the target schema.\r\n * @internal\r\n */\r\nexport async function addUnitSystem(context: SchemaMergeContext, change: UnitSystemDifference) {\r\n  await context.editor.unitSystems.createFromProps(context.targetSchemaKey, {\r\n    ...change.difference,\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing UnitSystem in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyUnitSystem(context: SchemaMergeContext, change: UnitSystemDifference, itemKey: SchemaItemKey) {\r\n  if(change.difference.label !== undefined) {\r\n    await context.editor.unitSystems.setDisplayLabel(itemKey, change.difference.label);\r\n  }\r\n  if(change.difference.description !== undefined) {\r\n    await context.editor.unitSystems.setDescription(itemKey, change.difference.description);\r\n  }\r\n}\r\n"]}

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

@@ -0,0 +1,18 @@
+import type { SchemaMergeContext } from "./SchemaMerger";
+import { SchemaItem, SchemaItemKey } from "@itwin/ecschema-metadata";
+/**
+ * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.
+ * @internal
+ */
+export declare function updateSchemaItemFullName(context: SchemaMergeContext, reference: string): Promise<string>;
+/**
+ * Updates the given reference if it refers to a SchemaItem in the source Schema and
+ * returns a SchemaItemKey. If any other schema is referred the reference is not change.
+ * @internal
+ */
+export declare function updateSchemaItemKey(context: SchemaMergeContext, reference: string): Promise<SchemaItemKey>;
+/**
+ * @internal
+ */
+export declare function locateSchemaItem(context: SchemaMergeContext, itemName: string, schemaType: string): Promise<SchemaItem>;
+//# sourceMappingURL=Utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../../src/Merging/Utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAkD,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAErH;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAG5F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAYvF;AAgBD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAQvG"}

package/lib/cjs/Merging/Utils.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.locateSchemaItem = exports.updateSchemaItemKey = exports.updateSchemaItemFullName = void 0;
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+/**
+ * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.
+ * @internal
+ */
+async function updateSchemaItemFullName(context, reference) {
+    const schemaItemKey = await updateSchemaItemKey(context, reference);
+    return schemaItemKey.fullName;
+}
+exports.updateSchemaItemFullName = updateSchemaItemFullName;
+/**
+ * Updates the given reference if it refers to a SchemaItem in the source Schema and
+ * returns a SchemaItemKey. If any other schema is referred the reference is not change.
+ * @internal
+ */
+async function updateSchemaItemKey(context, reference) {
+    const [schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(reference);
+    if (context.sourceSchemaKey.compareByName(schemaName)) {
+        return resolveSchemaItemKey(context.editor.schemaContext, new ecschema_metadata_1.SchemaItemKey(itemName, context.targetSchemaKey));
+    }
+    const referencedSchema = await context.targetSchema.getReference(schemaName);
+    if (referencedSchema !== undefined) {
+        return resolveSchemaItemKey(context.editor.schemaContext, new ecschema_metadata_1.SchemaItemKey(itemName, referencedSchema.schemaKey));
+    }
+    throw new Error(`Cannot locate referenced schema item ${reference}`);
+}
+exports.updateSchemaItemKey = updateSchemaItemKey;
+/**
+ * To support case insensitivity for schema items, the given key is checked if there
+ * exists an item for it.
+ * @internal
+ */
+async function resolveSchemaItemKey(schemaContext, itemKey) {
+    const item = await schemaContext.getSchemaItem(itemKey);
+    if (item === undefined) {
+        // If the schema item hasn't been created yet, we have to trust the given key is correctly spelled.
+        return itemKey;
+    }
+    return item.key;
+}
+/**
+ * @internal
+ */
+async function locateSchemaItem(context, itemName, schemaType) {
+    const schemaItemKey = new ecschema_metadata_1.SchemaItemKey(itemName, context.targetSchemaKey);
+    const schemaItem = await context.editor.schemaContext.getSchemaItem(schemaItemKey);
+    if (schemaItem === undefined) {
+        throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.ClassNotFound, `${schemaType} ${schemaItemKey.fullName} not found in schema context.`);
+    }
+    return schemaItem;
+}
+exports.locateSchemaItem = locateSchemaItem;
+//# sourceMappingURL=Utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Merging/Utils.ts"],"names":[],"mappings":";;;AAKA,gEAAqH;AAErH;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAAC,OAA2B,EAAE,SAAiB;IAC3F,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACpE,OAAO,aAAa,CAAC,QAAQ,CAAC;AAChC,CAAC;AAHD,4DAGC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAA2B,EAAE,SAAiB;IACtF,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,8BAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACnE,IAAI,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,OAAO,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,iCAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAClH,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC7E,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,iCAAa,CAAC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IACrH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;AACvE,CAAC;AAZD,kDAYC;AAED;;;;GAIG;AACH,KAAK,UAAU,oBAAoB,CAAC,aAA4B,EAAE,OAAsB;IACtF,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACxD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,mGAAmG;QACnG,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC;AAClB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,QAAgB,EAAE,UAAkB;IACtG,MAAM,aAAa,GAAG,IAAI,iCAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACnF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,GAAG,UAAU,IAAI,aAAa,CAAC,QAAQ,+BAA+B,CAAC,CAAC;IAClI,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AARD,4CAQC","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 { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { ECObjectsError, ECObjectsStatus, SchemaContext, SchemaItem, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.\r\n * @internal\r\n */\r\nexport async function updateSchemaItemFullName(context: SchemaMergeContext, reference: string) {\r\n  const schemaItemKey = await updateSchemaItemKey(context, reference);\r\n  return schemaItemKey.fullName;\r\n}\r\n\r\n/**\r\n * Updates the given reference if it refers to a SchemaItem in the source Schema and\r\n * returns a SchemaItemKey. If any other schema is referred the reference is not change.\r\n * @internal\r\n */\r\nexport async function updateSchemaItemKey(context: SchemaMergeContext, reference: string) {\r\n  const [schemaName, itemName] = SchemaItem.parseFullName(reference);\r\n  if (context.sourceSchemaKey.compareByName(schemaName)) {\r\n    return resolveSchemaItemKey(context.editor.schemaContext, new SchemaItemKey(itemName, context.targetSchemaKey));\r\n  }\r\n\r\n  const referencedSchema = await context.targetSchema.getReference(schemaName);\r\n  if (referencedSchema !== undefined) {\r\n    return resolveSchemaItemKey(context.editor.schemaContext, new SchemaItemKey(itemName, referencedSchema.schemaKey));\r\n  }\r\n\r\n  throw new Error(`Cannot locate referenced schema item ${reference}`);\r\n}\r\n\r\n/**\r\n * To support case insensitivity for schema items, the given key is checked if there\r\n * exists an item for it.\r\n * @internal\r\n */\r\nasync function resolveSchemaItemKey(schemaContext: SchemaContext, itemKey: SchemaItemKey): Promise<SchemaItemKey> {\r\n  const item = await schemaContext.getSchemaItem(itemKey);\r\n  if (item === undefined) {\r\n    // If the schema item hasn't been created yet, we have to trust the given key is correctly spelled.\r\n    return itemKey;\r\n  }\r\n  return item.key;\r\n}\r\n\r\n/**\r\n * @internal\r\n */\r\nexport async function locateSchemaItem(context: SchemaMergeContext, itemName: string, schemaType: string) {\r\n  const schemaItemKey = new SchemaItemKey(itemName, context.targetSchemaKey);\r\n  const schemaItem = await context.editor.schemaContext.getSchemaItem(schemaItemKey);\r\n  if (schemaItem === undefined) {\r\n    throw new ECObjectsError(ECObjectsStatus.ClassNotFound, `${schemaType} ${schemaItemKey.fullName} not found in schema context.`);\r\n  }\r\n\r\n  return schemaItem;\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-editing",
-  "version": "4.10.0-dev.1",
+  "version": "4.10.0-dev.2",
   "description": "ECSchema editing and validation API",
   "license": "MIT",
   "main": "lib/cjs/ecschema-editing.js",
@@ -41,16 +41,16 @@
     "rimraf": "^3.0.2",
     "sinon": "^17.0.2",
     "typescript": "~5.3.3",
-    "@itwin/core-bentley": "4.10.0-dev.1",
-    "@itwin/build-tools": "4.10.0-dev.1",
-    "@itwin/core-common": "4.10.0-dev.1",
-    "@itwin/ecschema-metadata": "4.10.0-dev.1",
-    "@itwin/core-quantity": "4.10.0-dev.1"
+    "@itwin/build-tools": "4.10.0-dev.2",
+    "@itwin/core-common": "4.10.0-dev.2",
+    "@itwin/core-bentley": "4.10.0-dev.2",
+    "@itwin/core-quantity": "4.10.0-dev.2",
+    "@itwin/ecschema-metadata": "4.10.0-dev.2"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "^4.10.0-dev.1",
-    "@itwin/core-quantity": "^4.10.0-dev.1",
-    "@itwin/ecschema-metadata": "^4.10.0-dev.1"
+    "@itwin/core-bentley": "^4.10.0-dev.2",
+    "@itwin/core-quantity": "^4.10.0-dev.2",
+    "@itwin/ecschema-metadata": "^4.10.0-dev.2"
   },
   "nyc": {
     "extends": "./node_modules/@itwin/build-tools/.nycrc"

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

@@ -1,8 +0,0 @@
-import { type CustomAttributeClassDifference } from "../Differencing/SchemaDifference";
-import { type SchemaItemMergerHandler } from "./SchemaItemMerger";
-/**
- * Defines a merge handler to merge Custom Attribute Class schema items.
- * @internal
- */
-export declare const customAttributeClassMerger: SchemaItemMergerHandler<CustomAttributeClassDifference>;
-//# sourceMappingURL=CAClassMerger.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CAClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAKlE;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,uBAAuB,CAAC,8BAA8B,CA0B9F,CAAC"}

package/lib/cjs/Merging/CAClassMerger.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.customAttributeClassMerger = void 0;
-const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
-const ClassMerger_1 = require("./ClassMerger");
-/**
- * Defines a merge handler to merge Custom Attribute Class schema items.
- * @internal
- */
-exports.customAttributeClassMerger = {
-    async add(context, change) {
-        if (change.difference.appliesTo === undefined) {
-            throw new Error("appliesTo is a required property of a CustomAttributeClass but it is not set");
-        }
-        return context.editor.customAttributes.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-            appliesTo: change.difference.appliesTo,
-        });
-    },
-    async modify(context, change, itemKey, item) {
-        if (change.difference.appliesTo !== undefined) {
-            const currentValue = (0, ecschema_metadata_1.containerTypeToString)(item.appliesTo);
-            if (currentValue !== "" && change.difference.appliesTo !== currentValue) {
-                const containerType = (0, ecschema_metadata_1.parseCustomAttributeContainerType)(`${currentValue}, ${change.difference.appliesTo}`);
-                if (containerType === undefined) {
-                    throw new Error("An invalid custom attribute class containerType has been provided.");
-                }
-                item.setAppliesTo(containerType);
-            }
-        }
-        return (0, ClassMerger_1.modifyClass)(context, change, itemKey, item);
-    },
-};
-//# sourceMappingURL=CAClassMerger.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CAClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":";;;AAOA,gEAAoG;AACpG,+CAA4C;AAE5C;;;GAGG;AACU,QAAA,0BAA0B,GAA4D;IACjG,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAClG,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YAC9E,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS;SACvC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAoB;QACzD,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,YAAY,GAAG,IAAA,yCAAqB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3D,IAAI,YAAY,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,YAAY,EAAE,CAAC;gBACxE,MAAM,aAAa,GAAG,IAAA,qDAAiC,EAAC,GAAG,YAAY,KAAK,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC3G,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;oBAChC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;gBACxF,CAAC;gBACD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACnC,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 CustomAttributeClassDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler } from \"./SchemaItemMerger\";\r\nimport { type MutableCAClass } from \"../Editing/Mutable/MutableCAClass\";\r\nimport { containerTypeToString, parseCustomAttributeContainerType } from \"@itwin/ecschema-metadata\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge Custom Attribute Class schema items.\r\n * @internal\r\n */\r\nexport const customAttributeClassMerger: SchemaItemMergerHandler<CustomAttributeClassDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.appliesTo === undefined) {\r\n      throw new Error(\"appliesTo is a required property of a CustomAttributeClass but it is not set\");\r\n    }\r\n\r\n    return context.editor.customAttributes.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      appliesTo: change.difference.appliesTo,\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutableCAClass) {\r\n    if (change.difference.appliesTo !== undefined) {\r\n      const currentValue = containerTypeToString(item.appliesTo);\r\n      if (currentValue !== \"\" && change.difference.appliesTo !== currentValue) {\r\n        const containerType = parseCustomAttributeContainerType(`${currentValue}, ${change.difference.appliesTo}`);\r\n        if (containerType === undefined) {\r\n          throw new Error(\"An invalid custom attribute class containerType has been provided.\");\r\n        }\r\n        item.setAppliesTo(containerType);\r\n      }\r\n    }\r\n    return modifyClass(context, change, itemKey, item);\r\n  },\r\n};\r\n"]}

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

@@ -1,35 +0,0 @@
-import type { SchemaMergeContext } from "./SchemaMerger";
-import { AnySchemaDifference, AnySchemaItemDifference, AnySchemaItemPathDifference } from "../Differencing/SchemaDifference";
-import { SchemaItem, SchemaItemKey } from "@itwin/ecschema-metadata";
-/**
- * @internal
- */
-export interface SchemaItemMergerHandler<T extends AnySchemaItemDifference | AnySchemaItemPathDifference> {
-    add: (context: SchemaMergeContext, difference: T) => Promise<SchemaItemKey>;
-    modify: (context: SchemaMergeContext, difference: T, itemKey: SchemaItemKey, item: any) => Promise<void>;
-}
-/**
- * @internal
- */
-export declare function locateSchemaItem(context: SchemaMergeContext, itemName: string, schemaType: string): Promise<SchemaItem>;
-/**
- * Merges the given set of schema items. As schema items may depend or relate with other
- * schema items, the list gets filtered to ensure the items get merged in a certain order.
- * @param context       The current merging context.
- * @param differences   Set of schema item that differed.
- * @returns             An async iterable with the merge result for each schema item.
- * @internal
- */
-export declare function mergeSchemaItems(context: SchemaMergeContext, differences: AnySchemaDifference[]): AsyncGenerator<void, void, unknown>;
-/**
- * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.
- * @internal
- */
-export declare function updateSchemaItemFullName(context: SchemaMergeContext, reference: string): Promise<string>;
-/**
- * Updates the given reference if it refers to a SchemaItem in the source Schema and
- * returns a SchemaItemKey. If any other schema is referred the reference is not change.
- * @internal
- */
-export declare function updateSchemaItemKey(context: SchemaMergeContext, reference: string): Promise<SchemaItemKey>;
-//# sourceMappingURL=SchemaItemMerger.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaItemMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC7H,OAAO,EAAkD,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAUrH;;GAEG;AACH,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,uBAAuB,GAAG,2BAA2B;IACtG,GAAG,EAAE,CAAC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5E,MAAM,EAAE,CAAC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1G;AAoBD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAQvG;AAED;;;;;;;GAOG;AACH,wBAAuB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,mBAAmB,EAAE,uCAwCtG;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAG5F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAYvF"}