@itwin/imodel-transformer 0.4.18-fedguidopt.6 → 1.0.0-dev.2

package/lib/cjs/IModelExporter.js

@@ -1,8 +1,8 @@
 "use strict";
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 /** @packageDocumentation
  * @module iModels
  */
@@ -26,7 +26,9 @@ class IModelExportHandler {
     /** If `true` is returned, then the CodeSpec will be exported.
      * @note This method can optionally be overridden to exclude an individual CodeSpec from the export. The base implementation always returns `true`.
      */
-    shouldExportCodeSpec(_codeSpec) { return true; }
+    shouldExportCodeSpec(_codeSpec) {
+        return true;
+    }
     /** Called when a CodeSpec should be exported.
      * @param codeSpec The CodeSpec to export
      * @param isUpdate If defined, then `true` indicates an UPDATE operation while `false` indicates an INSERT operation. If not defined, then INSERT vs. UPDATE is not known.
@@ -50,7 +52,9 @@ class IModelExportHandler {
     /** If `true` is returned, then the element will be exported.
      * @note This method can optionally be overridden to exclude an individual Element (and its children and ElementAspects) from the export. The base implementation always returns `true`.
      */
-    shouldExportElement(_element) { return true; }
+    shouldExportElement(_element) {
+        return true;
+    }
     /** Called when element is skipped instead of exported. */
     onSkipElement(_elementId) { }
     /** Called when an element should be exported.
@@ -71,7 +75,9 @@ class IModelExportHandler {
     /** If `true` is returned, then the ElementAspect will be exported.
      * @note This method can optionally be overridden to exclude an individual ElementAspect from the export. The base implementation always returns `true`.
      */
-    shouldExportElementAspect(_aspect) { return true; }
+    shouldExportElementAspect(_aspect) {
+        return true;
+    }
     /** Called when an ElementUniqueAspect should be exported.
      * @param aspect The ElementUniqueAspect to export
      * @param isUpdate If defined, then `true` indicates an UPDATE operation while `false` indicates an INSERT operation. If not defined, then INSERT vs. UPDATE is not known.
@@ -85,7 +91,9 @@ class IModelExportHandler {
     /** If `true` is returned, then the relationship will be exported.
      * @note This method can optionally be overridden to exclude an individual CodeSpec from the export. The base implementation always returns `true`.
      */
-    shouldExportRelationship(_relationship) { return true; }
+    shouldExportRelationship(_relationship) {
+        return true;
+    }
     /** Called when a Relationship should be exported.
      * @param relationship The Relationship to export
      * @param isUpdate If defined, then `true` indicates an UPDATE operation while `false` indicates an INSERT operation. If not defined, then INSERT vs. UPDATE is not known.
@@ -97,7 +105,9 @@ class IModelExportHandler {
     /** If `true` is returned, then the schema will be exported.
      * @note This method can optionally be overridden to exclude an individual schema from the export. The base implementation always returns `true`.
      */
-    shouldExportSchema(_schemaKey) { return true; }
+    shouldExportSchema(_schemaKey) {
+        return true;
+    }
     /** Called when a schema should be exported.
      * @param schema The schema to export
      * @note This should be overridden to actually do the export.
@@ -121,7 +131,7 @@ class IModelExporter {
     /**
      * Retrieve the cached entity change information.
      * @note This will only be initialized after [IModelExporter.exportChanges] is invoked.
-    */
+     */
     get sourceDbChanges() {
         return this._sourceDbChanges;
     }
@@ -194,11 +204,14 @@ class IModelExporter {
      * you pass to [[IModelExporter.exportChanges]]
      */
     async initialize(options) {
-        const hasChangeData = options.startChangeset || options.changesetRanges || options.changedInstanceIds;
-        if (this._sourceDbChanges || !this.sourceDb.isBriefcaseDb() || !hasChangeData)
+        if (!this.sourceDb.isBriefcaseDb() || this._sourceDbChanges)
+            return;
+        this._sourceDbChanges = await ChangedInstanceIds.initialize({
+            iModel: this.sourceDb,
+            ...options,
+        });
+        if (this._sourceDbChanges === undefined)
             return;
-        this._sourceDbChanges = options.changedInstanceIds
-            ?? await ChangedInstanceIds.initialize({ iModel: this.sourceDb, ...options });
         this._exportElementAspectsStrategy.setAspectChanges(this._sourceDbChanges.aspect);
     }
     /** Register the handler that will be called by IModelExporter. */
@@ -257,8 +270,13 @@ class IModelExporter {
         nodeAssert(this._sourceDbChanges !== undefined, "sourceDbChanges must be initialized.");
         await this.exportCodeSpecs();
         await this.exportFonts();
-        await this.exportModelContents(core_common_1.IModel.repositoryModelId);
-        await this.exportSubModels(core_common_1.IModel.repositoryModelId);
+        if (initOpts.skipPropagateChangesToRootElements) {
+            await this.exportModelContents(core_common_1.IModel.repositoryModelId);
+            await this.exportSubModels(core_common_1.IModel.repositoryModelId);
+        }
+        else {
+            await this.exportModel(core_common_1.IModel.repositoryModelId);
+        }
         await this.exportAllAspects();
         await this.exportRelationships(core_backend_1.ElementRefersToElements.classFullName);
         // handle deletes
@@ -278,14 +296,16 @@ class IModelExporter {
                     this.handler.onDeleteElement(elementId);
                 }
                 catch (err) {
-                    const isMissingErr = err instanceof core_common_1.IModelError && err.errorNumber === core_bentley_1.IModelStatus.NotFound;
+                    const isMissingErr = err instanceof core_common_1.IModelError &&
+                        err.errorNumber === core_bentley_1.IModelStatus.NotFound;
                     if (!isMissingErr)
                         throw err;
                 }
             }
         }
         if (this.visitRelationships) {
-            for (const relInstanceId of this._sourceDbChanges.relationship.deleteIds) {
+            for (const relInstanceId of this._sourceDbChanges.relationship
+                .deleteIds) {
                 this.handler.onDeleteRelationship(relInstanceId);
             }
         }
@@ -304,7 +324,9 @@ class IModelExporter {
         const sql = `
       SELECT s.Name, s.VersionMajor, s.VersionWrite, s.VersionMinor
       FROM ECDbMeta.ECSchemaDef s
-      ${this.wantSystemSchemas ? "" : `
+      ${this.wantSystemSchemas
+            ? ""
+            : `
       WHERE ECInstanceId >= (SELECT ECInstanceId FROM ECDbMeta.ECSchemaDef WHERE Name='BisCore')
       `}
       ORDER BY ECInstanceId
@@ -340,8 +362,8 @@ class IModelExporter {
      * @note This method is called from [[exportChanges]] and [[exportAll]], so it only needs to be called directly when exporting a subset of an iModel.
      */
     async exportCodeSpecs() {
-        core_bentley_1.Logger.logTrace(loggerCategory, `exportCodeSpecs()`);
-        const sql = `SELECT Name FROM BisCore:CodeSpec ORDER BY ECInstanceId`;
+        core_bentley_1.Logger.logTrace(loggerCategory, "exportCodeSpecs()");
+        const sql = "SELECT Name FROM BisCore:CodeSpec ORDER BY ECInstanceId";
         await this.sourceDb.withPreparedStatement(sql, async (statement) => {
             while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
                 const codeSpecName = statement.getValue(0).getString();
@@ -355,7 +377,8 @@ class IModelExporter {
     async exportCodeSpecByName(codeSpecName) {
         const codeSpec = this.sourceDb.codeSpecs.getByName(codeSpecName);
         let isUpdate;
-        if (undefined !== this._sourceDbChanges) { // is changeset information available?
+        if (undefined !== this._sourceDbChanges) {
+            // is changeset information available?
             if (this._sourceDbChanges.codeSpec.insertIds.has(codeSpec.id)) {
                 isUpdate = false;
             }
@@ -389,7 +412,7 @@ class IModelExporter {
      * @note This method is called from [[exportChanges]] and [[exportAll]], so it only needs to be called directly when exporting a subset of an iModel.
      */
     async exportFonts() {
-        core_bentley_1.Logger.logTrace(loggerCategory, `exportFonts()`);
+        core_bentley_1.Logger.logTrace(loggerCategory, "exportFonts()");
         for (const font of this.sourceDb.fontMap.fonts.values()) {
             await this.exportFontByNumber(font.id);
         }
@@ -408,19 +431,12 @@ class IModelExporter {
      * @note This method is called from [[exportChanges]] and [[exportAll]], so it only needs to be called directly when exporting a subset of an iModel.
      */
     async exportFontByNumber(fontNumber) {
-        let isUpdate;
-        if (undefined !== this._sourceDbChanges) { // is changeset information available?
-            const fontId = core_bentley_1.Id64.fromUint32Pair(fontNumber, 0); // changeset information uses Id64String, not number
-            if (this._sourceDbChanges.font.insertIds.has(fontId)) {
-                isUpdate = false;
-            }
-            else if (this._sourceDbChanges.font.updateIds.has(fontId)) {
-                isUpdate = true;
-            }
-            else {
-                return; // not in changeset, don't export
-            }
-        }
+        /** sourceDbChanges now works by using TS ChangesetECAdaptor which doesn't pick up changes to fonts since fonts is not an ec table.
+         * So lets always export fonts for the time being by always setting isUpdate = true.
+         * It is very rare and even problematic for the font table to reach a large size, so it is not a bottleneck in transforming changes.
+         * See https://github.com/iTwin/imodel-transformer/pull/135 for removed code.
+         */
+        const isUpdate = true;
         core_bentley_1.Logger.logTrace(loggerCategory, `exportFontById(${fontNumber})`);
         const font = this.sourceDb.fontMap.getFont(fontNumber);
         if (undefined !== font) {
@@ -436,7 +452,11 @@ class IModelExporter {
         if (model.isTemplate && !this.wantTemplateModels) {
             return;
         }
-        const modeledElement = this.sourceDb.elements.getElement({ id: modeledElementId, wantGeometry: this.wantGeometry, wantBRepData: this.wantGeometry });
+        const modeledElement = this.sourceDb.elements.getElement({
+            id: modeledElementId,
+            wantGeometry: this.wantGeometry,
+            wantBRepData: this.wantGeometry,
+        });
         core_bentley_1.Logger.logTrace(loggerCategory, `exportModel(${modeledElementId})`);
         if (this.shouldExportElement(modeledElement)) {
             await this.exportModelContainer(model);
@@ -449,7 +469,8 @@ class IModelExporter {
     /** Export the model (the container only) from the source iModel. */
     async exportModelContainer(model) {
         let isUpdate;
-        if (undefined !== this._sourceDbChanges) { // is changeset information available?
+        if (undefined !== this._sourceDbChanges) {
+            // is changeset information available?
             if (this._sourceDbChanges.model.insertIds.has(model.id)) {
                 isUpdate = false;
             }
@@ -479,8 +500,10 @@ class IModelExporter {
             core_bentley_1.Logger.logTrace(loggerCategory, `visitElements=false, skipping exportModelContents(${modelId})`);
             return;
         }
-        if (undefined !== this._sourceDbChanges) { // is changeset information available?
-            if (!this._sourceDbChanges.model.insertIds.has(modelId) && !this._sourceDbChanges.model.updateIds.has(modelId)) {
+        if (undefined !== this._sourceDbChanges) {
+            // is changeset information available?
+            if (!this._sourceDbChanges.model.insertIds.has(modelId) &&
+                !this._sourceDbChanges.model.updateIds.has(modelId)) {
                 return; // this optimization assumes that the Model changes (LastMod) any time an Element in the Model changes
             }
         }
@@ -547,7 +570,8 @@ class IModelExporter {
                 return false;
             }
         }
-        if (!this.wantTemplateModels && (element instanceof core_backend_1.RecipeDefinitionElement)) {
+        if (!this.wantTemplateModels &&
+            element instanceof core_backend_1.RecipeDefinitionElement) {
             core_bentley_1.Logger.logInfo(loggerCategory, `Excluded RecipeDefinitionElement ${element.id} because wantTemplate=false`);
             return false;
         }
@@ -568,11 +592,23 @@ class IModelExporter {
             core_bentley_1.Logger.logTrace(loggerCategory, `visitElements=false, skipping exportElement(${elementId})`);
             return;
         }
+        // Return early if the elementId is already in the excludedElementIds, that way we don't need to load the element from the db.
+        if (this._excludedElementIds.has(elementId)) {
+            core_bentley_1.Logger.logInfo(loggerCategory, `Excluded element ${elementId} by Id`);
+            this.handler.onSkipElement(elementId);
+            return;
+        }
         // are we processing changes?
-        const isUpdate = this._sourceDbChanges?.element.insertIds.has(elementId) ? false
-            : this._sourceDbChanges?.element.updateIds.has(elementId) ? true
+        const isUpdate = this._sourceDbChanges?.element.insertIds.has(elementId)
+            ? false
+            : this._sourceDbChanges?.element.updateIds.has(elementId)
+                ? true
                 : undefined;
-        const element = this.sourceDb.elements.getElement({ id: elementId, wantGeometry: this.wantGeometry, wantBRepData: this.wantGeometry });
+        const element = this.sourceDb.elements.getElement({
+            id: elementId,
+            wantGeometry: this.wantGeometry,
+            wantBRepData: this.wantGeometry,
+        });
         core_bentley_1.Logger.logTrace(loggerCategory, `exportElement(${element.id}, "${element.getDisplayLabel()}")${this.getChangeOpSuffix(isUpdate)}`);
         // the order and `await`ing of calls beyond here is depended upon by the IModelTransformer for a current bug workaround
         if (this.shouldExportElement(element)) {
@@ -612,7 +648,7 @@ class IModelExporter {
      */
     async exportRelationships(baseRelClassFullName) {
         if (!this.visitRelationships) {
-            core_bentley_1.Logger.logTrace(loggerCategory, `visitRelationships=false, skipping exportRelationships()`);
+            core_bentley_1.Logger.logTrace(loggerCategory, "visitRelationships=false, skipping exportRelationships()");
             return;
         }
         core_bentley_1.Logger.logTrace(loggerCategory, `exportRelationships(${baseRelClassFullName})`);
@@ -623,7 +659,9 @@ class IModelExporter {
         await this.sourceDb.withPreparedStatement(sql, async (statement) => {
             while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
                 const relationshipId = statement.getValue(0).getId();
-                const relationshipClass = statement.getValue(1).getClassNameForClassId();
+                const relationshipClass = statement
+                    .getValue(1)
+                    .getClassNameForClassId();
                 await this.exportRelationship(relationshipClass, relationshipId); // must call exportRelationship using the actual classFullName, not baseRelClassFullName
                 await this._yieldManager.allowYield();
             }
@@ -636,7 +674,8 @@ class IModelExporter {
             return;
         }
         let isUpdate;
-        if (undefined !== this._sourceDbChanges) { // is changeset information available?
+        if (undefined !== this._sourceDbChanges) {
+            // is changeset information available?
             if (this._sourceDbChanges.relationship.insertIds.has(relInstanceId)) {
                 isUpdate = false;
             }
@@ -665,95 +704,15 @@ class IModelExporter {
     /** Tracks incremental progress */
     async trackProgress() {
         this._progressCounter++;
-        if (0 === (this._progressCounter % this.progressInterval)) {
+        if (0 === this._progressCounter % this.progressInterval) {
             return this.handler.onProgress();
         }
     }
-    /**
-     * You may override this to store arbitrary json state in a exporter state dump, useful for some resumptions
-     * @see [[IModelTransformer.saveStateToFile]]
-     */
-    getAdditionalStateJson() {
-        return {};
-    }
-    /**
-     * You may override this to load arbitrary json state in a transformer state dump, useful for some resumptions
-     * @see [[IModelTransformer.loadStateFromFile]]
-     */
-    loadAdditionalStateJson(_additionalState) { }
-    /**
-     * Reload our state from a JSON object
-     * Intended for [[IModelTransformer.resumeTransformation]]
-     * @internal
-     * You can load custom json from the exporter save state for custom exporters by overriding [[IModelExporter.loadAdditionalStateJson]]
-     */
-    loadStateFromJson(state) {
-        if (state.exporterClass !== this.constructor.name)
-            throw Error("resuming from a differently named exporter class, it is not necessarily valid to resume with a different exporter class");
-        this.wantGeometry = state.wantGeometry;
-        this.wantTemplateModels = state.wantTemplateModels;
-        this.wantSystemSchemas = state.wantSystemSchemas;
-        this.visitElements = state.visitElements;
-        this.visitRelationships = state.visitRelationships;
-        this._excludedCodeSpecNames = new Set(state.excludedCodeSpecNames);
-        this._excludedElementIds = core_bentley_1.CompressedId64Set.decompressSet(state.excludedElementIds),
-            this._excludedElementCategoryIds = core_bentley_1.CompressedId64Set.decompressSet(state.excludedElementCategoryIds),
-            this._excludedElementClasses = new Set(state.excludedElementClassNames.map((c) => this.sourceDb.getJsClass(c)));
-        this._exportElementAspectsStrategy.loadExcludedElementAspectClasses(state.excludedElementAspectClassFullNames);
-        this._excludedRelationshipClasses = new Set(state.excludedRelationshipClassNames.map((c) => this.sourceDb.getJsClass(c)));
-        this.loadAdditionalStateJson(state.additionalState);
-    }
-    /**
-     * Serialize state to a JSON object
-     * Intended for [[IModelTransformer.resumeTransformation]]
-     * @internal
-     * You can add custom json to the exporter save state for custom exporters by overriding [[IModelExporter.getAdditionalStateJson]]
-     */
-    saveStateToJson() {
-        return {
-            exporterClass: this.constructor.name,
-            wantGeometry: this.wantGeometry,
-            wantTemplateModels: this.wantTemplateModels,
-            wantSystemSchemas: this.wantSystemSchemas,
-            visitElements: this.visitElements,
-            visitRelationships: this.visitRelationships,
-            excludedCodeSpecNames: [...this._excludedCodeSpecNames],
-            excludedElementIds: core_bentley_1.CompressedId64Set.compressSet(this._excludedElementIds),
-            excludedElementCategoryIds: core_bentley_1.CompressedId64Set.compressSet(this._excludedElementCategoryIds),
-            excludedElementClassNames: Array.from(this._excludedElementClasses, (cls) => cls.classFullName),
-            excludedElementAspectClassFullNames: [...this._exportElementAspectsStrategy.excludedElementAspectClassFullNames],
-            excludedRelationshipClassNames: Array.from(this._excludedRelationshipClasses, (cls) => cls.classFullName),
-            additionalState: this.getAdditionalStateJson(),
-        };
-    }
 }
 exports.IModelExporter = IModelExporter;
-/**
- * Asserts that the passed in options have exactly one of:
- * startChangeset xor changesetRanges xor changedInstanceIds
- * defined
- */
-function assertHasChangeDataOptions(opts) {
-    const xor = (...args) => {
-        let result = false;
-        for (const a of args) {
-            if (!result && a)
-                result = true;
-            else if (result && a)
-                return false;
-        }
-        return result;
-    };
-    nodeAssert(xor(opts.startChangeset, opts.changesetRanges, opts.changedInstanceIds), "exactly one of startChangeset, XOR changesetRanges XOR opts.changedInstanceIds may be defined but "
-        + `received ${JSON.stringify({
-            startChangeset: !!opts.startChangeset,
-            changesetRanges: !!opts.changesetRanges,
-            ChangedInstanceIds: !!opts.changedInstanceIds,
-        })}`);
-}
 /** Class for holding change information.
  * @beta
-*/
+ */
 class ChangedInstanceOps {
     constructor() {
         this.insertIds = new Set();
@@ -763,11 +722,11 @@ class ChangedInstanceOps {
     /** Initializes the object from IModelJsNative.ChangedInstanceOpsProps. */
     addFromJson(val) {
         if (undefined !== val) {
-            if ((undefined !== val.insert) && (Array.isArray(val.insert)))
+            if (undefined !== val.insert && Array.isArray(val.insert))
                 val.insert.forEach((id) => this.insertIds.add(id));
-            if ((undefined !== val.update) && (Array.isArray(val.update)))
+            if (undefined !== val.update && Array.isArray(val.update))
                 val.update.forEach((id) => this.updateIds.add(id));
-            if ((undefined !== val.delete) && (Array.isArray(val.delete)))
+            if (undefined !== val.delete && Array.isArray(val.delete))
                 val.delete.forEach((id) => this.deleteIds.add(id));
         }
     }
@@ -778,69 +737,174 @@ exports.ChangedInstanceOps = ChangedInstanceOps;
  * @beta
  */
 class ChangedInstanceIds {
-    constructor() {
+    constructor(db) {
         this.codeSpec = new ChangedInstanceOps();
         this.model = new ChangedInstanceOps();
         this.element = new ChangedInstanceOps();
         this.aspect = new ChangedInstanceOps();
         this.relationship = new ChangedInstanceOps();
         this.font = new ChangedInstanceOps();
+        this._db = db;
+    }
+    async setupECClassIds() {
+        this._codeSpecSubclassIds = new Set();
+        this._modelSubclassIds = new Set();
+        this._elementSubclassIds = new Set();
+        this._aspectSubclassIds = new Set();
+        this._relationshipSubclassIds = new Set();
+        const addECClassIdsToSet = async (setToModify, baseClass) => {
+            for await (const row of this._db.createQueryReader(`SELECT ECInstanceId FROM ECDbMeta.ECClassDef where ECInstanceId IS (${baseClass})`)) {
+                setToModify.add(row.ECInstanceId);
+            }
+        };
+        const promises = [
+            addECClassIdsToSet(this._codeSpecSubclassIds, "BisCore.CodeSpec"),
+            addECClassIdsToSet(this._modelSubclassIds, "BisCore.Model"),
+            addECClassIdsToSet(this._elementSubclassIds, "BisCore.Element"),
+            addECClassIdsToSet(this._aspectSubclassIds, "BisCore.ElementUniqueAspect"),
+            addECClassIdsToSet(this._aspectSubclassIds, "BisCore.ElementMultiAspect"),
+            addECClassIdsToSet(this._relationshipSubclassIds, "BisCore.ElementRefersToElements"),
+        ];
+        await Promise.all(promises);
+    }
+    get _ecClassIdsInitialized() {
+        return (this._codeSpecSubclassIds &&
+            this._modelSubclassIds &&
+            this._elementSubclassIds &&
+            this._aspectSubclassIds &&
+            this._relationshipSubclassIds);
+    }
+    isRelationship(ecClassId) {
+        return this._relationshipSubclassIds?.has(ecClassId);
+    }
+    isCodeSpec(ecClassId) {
+        return this._codeSpecSubclassIds?.has(ecClassId);
+    }
+    isAspect(ecClassId) {
+        return this._aspectSubclassIds?.has(ecClassId);
+    }
+    isModel(ecClassId) {
+        return this._modelSubclassIds?.has(ecClassId);
+    }
+    isElement(ecClassId) {
+        return this._elementSubclassIds?.has(ecClassId);
+    }
+    /**
+     * Adds the provided [[ChangedECInstance]] to the appropriate set of changes by class type (codeSpec, model, element, aspect, or relationship) maintained by this instance of ChangedInstanceIds.
+     * If the same ECInstanceId is seen multiple times, the changedInstanceIds will be modified accordingly, i.e. if an id 'x' was updated but now we see 'x' was deleted, we will remove 'x'
+     * from the set of updatedIds and add it to the set of deletedIds for the appropriate class type.
+     * @param change ChangedECInstance which has the ECInstanceId, changeType (insert, update, delete) and ECClassId of the changed entity
+     */
+    async addChange(change) {
+        if (!this._ecClassIdsInitialized)
+            await this.setupECClassIds();
+        const ecClassId = change.ECClassId ?? change.$meta?.fallbackClassId;
+        if (ecClassId === undefined)
+            throw new Error(`ECClassId was not found for id: ${change.ECInstanceId}! Table is : ${change?.$meta?.tables}`);
+        const changeType = change.$meta?.op;
+        if (changeType === undefined)
+            throw new Error(`ChangeType was undefined for id: ${change.ECInstanceId}.`);
+        if (this.isRelationship(ecClassId))
+            this.handleChange(this.relationship, changeType, change.ECInstanceId);
+        else if (this.isCodeSpec(ecClassId))
+            this.handleChange(this.codeSpec, changeType, change.ECInstanceId);
+        else if (this.isAspect(ecClassId))
+            this.handleChange(this.aspect, changeType, change.ECInstanceId);
+        else if (this.isModel(ecClassId))
+            this.handleChange(this.model, changeType, change.ECInstanceId);
+        else if (this.isElement(ecClassId))
+            this.handleChange(this.element, changeType, change.ECInstanceId);
+    }
+    handleChange(changedInstanceOps, changeType, id) {
+        // if changeType is a delete and we already have the id in the inserts then we can remove the id from the inserts.
+        // if changeType is a delete and we already have the id in the updates then we can remove the id from the updates AND add it to the deletes.
+        // if changeType is an insert and we already have the id in the deletes then we can remove the id from the deletes AND add it to the inserts.
+        if (changeType === "Inserted") {
+            changedInstanceOps.insertIds.add(id);
+            changedInstanceOps.deleteIds.delete(id);
+        }
+        else if (changeType === "Updated") {
+            if (!changedInstanceOps.insertIds.has(id))
+                changedInstanceOps.updateIds.add(id);
+        }
+        else if (changeType === "Deleted") {
+            // If we've inserted the entity at some point already and now we're seeing a delete. We can simply remove the entity from our inserted ids without adding it to deletedIds.
+            if (changedInstanceOps.insertIds.has(id))
+                changedInstanceOps.insertIds.delete(id);
+            else {
+                changedInstanceOps.updateIds.delete(id);
+                changedInstanceOps.deleteIds.add(id);
+            }
+        }
     }
     /**
      * Initializes a new ChangedInstanceIds object with information taken from a range of changesets.
-     * @deprecated in 0.1.x. Pass a [[ChangedInstanceIdsInitOptions]] object instead of a changeset id
-     * @param accessToken Access token.
-     * @param iModel IModel briefcase whose changesets will be queried.
-     * @param firstChangesetId Changeset id.
-     * @note Modified element information will be taken from a range of changesets. First changeset in a range will be the 'firstChangesetId', the last will be whichever changeset the 'iModel' briefcase is currently opened on.
-     */
-    static async initialize(accessTokenOrOpts, iModel, startChangesetId) {
-        const opts = typeof accessTokenOrOpts === "object"
-            ? accessTokenOrOpts
-            : {
-                accessToken: accessTokenOrOpts,
-                iModel: iModel,
-                startChangeset: { id: startChangesetId },
-            };
-        assertHasChangeDataOptions(opts);
+     */
+    static async initialize(opts) {
+        if ("changedInstanceIds" in opts)
+            return opts.changedInstanceIds;
         const iModelId = opts.iModel.iModelId;
         const accessToken = opts.accessToken;
-        const changesetRanges = opts.changesetRanges
-            ?? [[
-                    // we know startChangeset is defined because of the assert above
-                    opts.startChangeset.index
-                        ?? (await core_backend_1.IModelHost.hubAccess.queryChangeset({
+        const startChangeset = "startChangeset" in opts ? opts.startChangeset : undefined;
+        const changesetRanges = startChangeset !== undefined
+            ? [
+                [
+                    startChangeset.index ??
+                        (await core_backend_1.IModelHost.hubAccess.queryChangeset({
                             iModelId,
-                            changeset: { id: opts.startChangeset.id ?? opts.iModel.changeset.id },
+                            changeset: {
+                                id: startChangeset.id ?? opts.iModel.changeset.id,
+                            },
                             accessToken,
                         })).index,
-                    opts.iModel.changeset.index
-                        ?? (await core_backend_1.IModelHost.hubAccess.queryChangeset({
+                    opts.iModel.changeset.index ??
+                        (await core_backend_1.IModelHost.hubAccess.queryChangeset({
                             iModelId,
                             changeset: { id: opts.iModel.changeset.id },
                             accessToken,
                         })).index,
-                ]];
-        core_bentley_1.Logger.logTrace(loggerCategory, `ChangedInstanceIds.initialize ranges: ${changesetRanges.join("|")}`);
-        const changesets = (await Promise.all(changesetRanges.map(async ([first, end]) => core_backend_1.IModelHost.hubAccess.downloadChangesets({
-            accessToken,
-            iModelId, range: { first, end },
-            targetDir: core_backend_1.BriefcaseManager.getChangeSetsPath(iModelId),
-        })))).flat();
-        const changedInstanceIds = new ChangedInstanceIds();
-        const changesetFiles = changesets.map((c) => c.pathname);
-        const statusOrResult = opts.iModel.nativeDb.extractChangedInstanceIdsFromChangeSets(changesetFiles);
-        if (statusOrResult.error) {
-            throw new core_common_1.IModelError(statusOrResult.error.status, "Error processing changeset");
-        }
-        const result = statusOrResult.result;
-        (0, core_bentley_1.assert)(result !== undefined);
-        changedInstanceIds.codeSpec.addFromJson(result.codeSpec);
-        changedInstanceIds.model.addFromJson(result.model);
-        changedInstanceIds.element.addFromJson(result.element);
-        changedInstanceIds.aspect.addFromJson(result.aspect);
-        changedInstanceIds.relationship.addFromJson(result.relationship);
-        changedInstanceIds.font.addFromJson(result.font);
+                ],
+            ]
+            : "changesetRanges" in opts
+                ? opts.changesetRanges
+                : undefined;
+        const csFileProps = changesetRanges !== undefined
+            ? (await Promise.all(changesetRanges.map(async ([first, end]) => core_backend_1.IModelHost.hubAccess.downloadChangesets({
+                accessToken,
+                iModelId,
+                range: { first, end },
+                targetDir: core_backend_1.BriefcaseManager.getChangeSetsPath(iModelId),
+            })))).flat()
+            : "csFileProps" in opts
+                ? opts.csFileProps
+                : undefined;
+        if (csFileProps === undefined)
+            return undefined;
+        const changedInstanceIds = new ChangedInstanceIds(opts.iModel);
+        const relationshipECClassIdsToSkip = new Set();
+        for await (const row of opts.iModel.createQueryReader("SELECT ECInstanceId FROM ECDbMeta.ECClassDef where ECInstanceId IS (BisCore.ElementDrivesElement)")) {
+            relationshipECClassIdsToSkip.add(row.ECInstanceId);
+        }
+        for (const csFile of csFileProps) {
+            const csReader = core_backend_1.SqliteChangesetReader.openFile({
+                fileName: csFile.pathname,
+                db: opts.iModel,
+                disableSchemaCheck: true,
+            });
+            const csAdaptor = new core_backend_1.ChangesetECAdaptor(csReader);
+            const ecChangeUnifier = new core_backend_1.PartialECChangeUnifier();
+            while (csAdaptor.step()) {
+                ecChangeUnifier.appendFrom(csAdaptor);
+            }
+            const changes = [...ecChangeUnifier.instances];
+            for (const change of changes) {
+                if (change.ECClassId !== undefined &&
+                    relationshipECClassIdsToSkip.has(change.ECClassId))
+                    continue;
+                await changedInstanceIds.addChange(change);
+            }
+            csReader.close();
+        }
         return changedInstanceIds;
     }
 }