@itwin/imodel-transformer 2.0.0-dev.4 → 2.0.0-dev.6

package/lib/cjs/IModelTransformer.js

@@ -120,6 +120,26 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         AND Identifier=:identifier
       LIMIT 1
     `;
+        // if (aspectProps.scope === undefined) return undefined;
+        // const params = new QueryBinder().bindId("elementId", aspectProps.element.id);
+        // params.bindId("scopeId", aspectProps.scope.id);
+        // params.bindString("kind", aspectProps.kind);
+        // params.bindString("identifier", aspectProps.identifier);
+        // const result = await dbToQuery.createQueryReader(sql);
+        // if (result) {
+        //   const aspectId = result.current.id;
+        //   const versionValue = result.current[1];
+        //   const version = versionValue.isNull
+        //     ? undefined
+        //     : versionValue.getString();
+        //   const jsonPropsValue = result.current[2];
+        //   const jsonProperties = jsonPropsValue.isNull
+        //     ? undefined
+        //     : jsonPropsValue.getString();
+        //   return { aspectId, version, jsonProperties };
+        // }
+        // else
+        //   return undefined;
         // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
         return dbToQuery.withPreparedStatement(sql, (statement) => {
             statement.bindId("elementId", aspectProps.element.id);
@@ -239,7 +259,6 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             // non-falsy defaults
             cloneUsingBinaryGeometry: options?.cloneUsingBinaryGeometry ?? true,
             targetScopeElementId: options?.targetScopeElementId ?? core_common_1.IModel.rootSubjectId,
-            // eslint-disable-next-line @typescript-eslint/no-deprecated
             danglingReferencesBehavior: options?.danglingReferencesBehavior ?? "reject",
             branchRelationshipDataBehavior: options?.branchRelationshipDataBehavior ?? "reject",
             skipPropagateChangesToRootElements: options?.skipPropagateChangesToRootElements ?? true,
@@ -332,7 +351,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     /** Dispose any native resources associated with this IModelTransformer. */
     dispose() {
         core_bentley_1.Logger.logTrace(loggerCategory, "dispose()");
-        this.context.dispose();
+        this.context[Symbol.dispose]();
     }
     /** Log current settings that affect IModelTransformer's behavior. */
     logSettings() {
@@ -385,7 +404,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         };
         return aspectProps;
     }
-    static initRelationshipProvenanceOptions(sourceRelInstanceId, targetRelInstanceId, args) {
+    static async initRelationshipProvenanceOptions(sourceRelInstanceId, targetRelInstanceId, args) {
         const provenanceDb = args.isReverseSynchronization
             ? args.sourceDb
             : args.targetDb;
@@ -395,12 +414,13 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         const provenanceRelInstanceId = args.isReverseSynchronization
             ? sourceRelInstanceId
             : targetRelInstanceId;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        const elementId = provenanceDb.withPreparedStatement("SELECT SourceECInstanceId FROM bis.ElementRefersToElements WHERE ECInstanceId=?", (stmt) => {
-            stmt.bindId(1, provenanceRelInstanceId);
-            nodeAssert(stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW);
-            return stmt.getValue(0).getId();
+        const sql = "SELECT SourceECInstanceId FROM bis.ElementRefersToElements WHERE ECInstanceId=?";
+        const params = new core_common_1.QueryBinder().bindId(1, provenanceRelInstanceId);
+        const reader = provenanceDb.createQueryReader(sql, params, {
+            usePrimaryConn: true,
         });
+        nodeAssert(await reader.step(), "relationship provenance query returned no rows");
+        const elementId = reader.current[0];
         const jsonProperties = args.forceOldRelationshipProvenanceMethod
             ? { targetRelInstanceId }
             : { provenanceRelInstanceId };
@@ -438,8 +458,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * The `identifier` property of the ExternalSourceAspect will be the ECInstanceId of the relationship in the master iModel.
      * The ECInstanceId of the relationship in the branch iModel will be stored in the JsonProperties of the ExternalSourceAspect.
      */
-    initRelationshipProvenance(sourceRelationship, targetRelInstanceId) {
-        return IModelTransformer.initRelationshipProvenanceOptions(sourceRelationship.id, targetRelInstanceId, {
+    async initRelationshipProvenance(sourceRelationship, targetRelInstanceId) {
+        return await IModelTransformer.initRelationshipProvenanceOptions(sourceRelationship.id, targetRelInstanceId, {
             sourceDb: this.sourceDb,
             targetDb: this.targetDb,
             isReverseSynchronization: this.isReverseSynchronization,
@@ -517,7 +537,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @returns the last synced version (changesetId) on the target scope's external source aspect,
      *          if this was a [BriefcaseDb]($backend)
      */
-    initScopeProvenance() {
+    async initScopeProvenance() {
         const aspectProps = {
             id: undefined,
             version: undefined,
@@ -548,15 +568,14 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
           AND Kind=:kind
         LIMIT 1
       `;
-            // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-            const hasConflictingScope = this.provenanceDb.withPreparedStatement(sql, 
-            // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-            (statement) => {
-                statement.bindId("elementId", aspectProps.element.id);
-                statement.bindId("scopeId", aspectProps.scope.id); // this scope.id can never be invalid, we create it above
-                statement.bindString("kind", aspectProps.kind);
-                return core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step();
+            const params = new core_common_1.QueryBinder();
+            params.bindId("elementId", aspectProps.element.id);
+            params.bindId("scopeId", aspectProps.scope.id); // this scope.id can never be invalid, we create it above
+            params.bindString("kind", aspectProps.kind);
+            const reader = this.provenanceDb.createQueryReader(sql, params, {
+                usePrimaryConn: true,
             });
+            const hasConflictingScope = await reader.step();
             if (hasConflictingScope) {
                 throw new core_common_1.IModelError(core_bentley_1.IModelStatus.InvalidId, "Provenance scope conflict");
             }
@@ -648,7 +667,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @note provenance is done by federation guids where possible
      * @note this may execute on each element more than once! Only use in cases where that is handled
      */
-    static forEachTrackedElement(args) {
+    static async forEachTrackedElement(args) {
         if (args.provenanceDb === args.provenanceSourceDb)
             return;
         if (!args.provenanceDb.containsClass(core_backend_1.ExternalSourceAspect.classFullName)) {
@@ -673,42 +692,28 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         // NOTE: if we exposed the native attach database support,
         // we could get the intersection of fed guids in one query, not sure if it would be faster
         // OR we could do a raw sqlite query...
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        sourceDb.withStatement(elementIdByFedGuidQuery, (sourceStmt) => 
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        targetDb.withStatement(elementIdByFedGuidQuery, (targetStmt) => {
-            if (sourceStmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return;
-            let sourceRow = sourceStmt.getRow();
-            if (targetStmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return;
-            let targetRow = targetStmt.getRow();
-            // NOTE: these comparisons rely upon the lowercase of the guid,
-            // and the fact that '0' < '9' < a' < 'f' in ascii/utf8
-            while (true) {
-                const currSourceRow = sourceRow, currTargetRow = targetRow;
-                if (currSourceRow.federationGuid !== undefined &&
-                    currTargetRow.federationGuid !== undefined &&
-                    currSourceRow.federationGuid === currTargetRow.federationGuid) {
-                    // data flow direction is always sourceDb -> targetDb and it does not depend on where the explicit element provenance is stored
-                    args.fn(sourceRow.id, targetRow.id);
-                }
-                if (currTargetRow.federationGuid === undefined ||
-                    (currSourceRow.federationGuid !== undefined &&
-                        currSourceRow.federationGuid >= currTargetRow.federationGuid)) {
-                    if (targetStmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                        return;
-                    targetRow = targetStmt.getRow();
-                }
-                if (currSourceRow.federationGuid === undefined ||
-                    (currTargetRow.federationGuid !== undefined &&
-                        currSourceRow.federationGuid <= currTargetRow.federationGuid)) {
-                    if (sourceStmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                        return;
-                    sourceRow = sourceStmt.getRow();
-                }
+        const sourceReader = sourceDb.createQueryReader(elementIdByFedGuidQuery);
+        const targetReader = targetDb.createQueryReader(elementIdByFedGuidQuery);
+        let hasSourceRow = await sourceReader.step();
+        let hasTargetRow = await targetReader.step();
+        while (hasSourceRow && hasTargetRow) {
+            const sourceFedGuid = sourceReader.current.federationGuid;
+            const targetFedGuid = targetReader.current.federationGuid;
+            if (sourceFedGuid !== undefined &&
+                targetFedGuid !== undefined &&
+                sourceFedGuid === targetFedGuid) {
+                // data flow direction is always sourceDb -> targetDb and it does not depend on where the explicit element provenance is stored
+                args.fn(sourceReader.current.id, targetReader.current.id);
+            }
+            if (targetFedGuid === undefined ||
+                (sourceFedGuid !== undefined && sourceFedGuid >= targetFedGuid)) {
+                hasTargetRow = await targetReader.step();
             }
-        }));
+            if (sourceFedGuid === undefined ||
+                (targetFedGuid !== undefined && sourceFedGuid <= targetFedGuid)) {
+                hasSourceRow = await sourceReader.step();
+            }
+        }
         // query for provenanceDb
         const provenanceAspectsQuery = `
       SELECT esa.Identifier, Element.Id
@@ -719,23 +724,22 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         // Technically this will a second time call the function (as documented) on
         // victims of the old provenance method that have both fedguids and an inserted aspect.
         // But this is a private function with one known caller where that doesn't matter
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        args.provenanceDb.withPreparedStatement(provenanceAspectsQuery, (stmt) => {
-            const runFnInDataFlowDirection = (sourceId, targetId) => args.isReverseSynchronization
-                ? args.fn(sourceId, targetId)
-                : args.fn(targetId, sourceId);
-            stmt.bindId("scopeId", args.targetScopeElementId);
-            stmt.bindString("kind", core_backend_1.ExternalSourceAspect.Kind.Element);
-            while (core_bentley_1.DbResult.BE_SQLITE_ROW === stmt.step()) {
-                // ExternalSourceAspect.Identifier is of type string
-                const aspectIdentifier = stmt.getValue(0).getString();
-                const elementId = stmt.getValue(1).getId();
-                runFnInDataFlowDirection(elementId, aspectIdentifier);
-            }
-        });
-    }
-    forEachTrackedElement(fn) {
-        return IModelTransformer.forEachTrackedElement({
+        const runFnInDataFlowDirection = (sourceId, targetId) => args.isReverseSynchronization
+            ? args.fn(sourceId, targetId)
+            : args.fn(targetId, sourceId);
+        const params = new core_common_1.QueryBinder();
+        params.bindId("scopeId", args.targetScopeElementId);
+        params.bindString("kind", core_backend_1.ExternalSourceAspect.Kind.Element);
+        const provenanceReader = args.provenanceDb.createQueryReader(provenanceAspectsQuery, params);
+        for await (const row of provenanceReader) {
+            // ExternalSourceAspect.Identifier is of type string
+            const aspectIdentifier = row[0];
+            const elementId = row.id;
+            runFnInDataFlowDirection(elementId, aspectIdentifier);
+        }
+    }
+    async forEachTrackedElement(fn) {
+        return await IModelTransformer.forEachTrackedElement({
             provenanceSourceDb: this.provenanceSourceDb,
             provenanceDb: this.provenanceDb,
             targetScopeElementId: this.targetScopeElementId,
@@ -751,23 +755,25 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @param entityInProvenanceSourceId
      * @returns the elementId that the ESA is stored on, esa.Element.Id
      */
-    _queryProvenanceForElement(entityInProvenanceSourceId) {
+    async _queryProvenanceForElement(entityInProvenanceSourceId) {
         // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return this.provenanceDb.withPreparedStatement(`
+        const sql = `
         SELECT esa.Element.Id
         FROM Bis.ExternalSourceAspect esa
         WHERE esa.Kind=?
           AND esa.Scope.Id=?
           AND esa.Identifier=?
-      `, (stmt) => {
-            stmt.bindString(1, core_backend_1.ExternalSourceAspect.Kind.Element);
-            stmt.bindId(2, this.targetScopeElementId);
-            stmt.bindString(3, entityInProvenanceSourceId);
-            if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return stmt.getValue(0).getId();
-            else
-                return undefined;
-        });
+      `;
+        const params = new core_common_1.QueryBinder();
+        params.bindString(1, core_backend_1.ExternalSourceAspect.Kind.Element);
+        params.bindId(2, this.targetScopeElementId);
+        params.bindString(3, entityInProvenanceSourceId);
+        const result = this.provenanceDb.createQueryReader(sql, params);
+        if (await result.step()) {
+            return result.current.id;
+        }
+        else
+            return undefined;
     }
     /**
      * Queries the provenanceDb for an ESA whose identifier is equal to the provided 'entityInProvenanceSourceId'.
@@ -776,35 +782,36 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @param entityInProvenanceSourceId
      * @returns
      */
-    _queryProvenanceForRelationship(entityInProvenanceSourceId, sourceRelInfo) {
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return this.provenanceDb.withPreparedStatement(`
-        SELECT
-          ECInstanceId,
-          JSON_EXTRACT(JsonProperties, '$.targetRelInstanceId'),
-          JSON_EXTRACT(JsonProperties, '$.provenanceRelInstanceId')
-        FROM Bis.ExternalSourceAspect
-        WHERE Kind=?
-          AND Scope.Id=?
-          AND Identifier=?
-      `, (stmt) => {
-            stmt.bindString(1, core_backend_1.ExternalSourceAspect.Kind.Relationship);
-            stmt.bindId(2, this.targetScopeElementId);
-            stmt.bindString(3, entityInProvenanceSourceId);
-            if (stmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return undefined;
-            const aspectId = stmt.getValue(0).getId();
-            const provenanceRelInstIdVal = stmt.getValue(2);
-            const provenanceRelInstanceId = !provenanceRelInstIdVal.isNull
-                ? provenanceRelInstIdVal.getString()
-                : this._queryTargetRelId(sourceRelInfo);
+    async _queryProvenanceForRelationship(entityInProvenanceSourceId, sourceRelInfo) {
+        const sql = `
+      SELECT
+        ECInstanceId,
+        JSON_EXTRACT(JsonProperties, '$.provenanceRelInstanceId') AS provenanceRelInstId
+      FROM Bis.ExternalSourceAspect
+      WHERE Kind=?
+        AND Scope.Id=?
+        AND Identifier=?
+    `;
+        const params = new core_common_1.QueryBinder();
+        params.bindString(1, core_backend_1.ExternalSourceAspect.Kind.Relationship);
+        params.bindId(2, this.targetScopeElementId);
+        params.bindString(3, entityInProvenanceSourceId);
+        const result = this.provenanceDb.createQueryReader(sql, params);
+        if (await result.step()) {
+            const aspectId = result.current.id;
+            const provenanceRelInstId = result.current.provenanceRelInstId;
+            const provenanceRelInstanceId = provenanceRelInstId !== undefined
+                ? provenanceRelInstId
+                : await this._queryTargetRelId(sourceRelInfo);
             return {
                 aspectId,
                 relationshipId: provenanceRelInstanceId,
             };
-        });
+        }
+        else
+            return undefined;
     }
-    _queryTargetRelId(sourceRelInfo) {
+    async _queryTargetRelId(sourceRelInfo) {
         const targetRelInfo = {
             sourceId: this.context.findTargetElementId(sourceRelInfo.sourceId),
             targetId: this.context.findTargetElementId(sourceRelInfo.targetId),
@@ -812,60 +819,61 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         if (targetRelInfo.sourceId === undefined ||
             targetRelInfo.targetId === undefined)
             return undefined; // couldn't find an element, rel is invalid or deleted
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return this.targetDb.withPreparedStatement(`
-      SELECT ECInstanceId
-      FROM bis.ElementRefersToElements
-      WHERE SourceECInstanceId=?
-        AND TargetECInstanceId=?
-        AND ECClassId=?
-    `, (stmt) => {
-            stmt.bindId(1, targetRelInfo.sourceId);
-            stmt.bindId(2, targetRelInfo.targetId);
-            stmt.bindId(3, this._targetClassNameToClassId(sourceRelInfo.classFullName));
-            if (stmt.step() !== core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return undefined;
-            return stmt.getValue(0).getId();
-        });
+        const sql = `
+      select ecinstanceid
+      from bis.elementreferstoelements
+      where sourceecinstanceid=?
+        and targetecinstanceid=?
+        and ecclassid=?
+    `;
+        const params = new core_common_1.QueryBinder();
+        params.bindId(1, targetRelInfo.sourceId);
+        params.bindId(2, targetRelInfo.targetId);
+        params.bindId(3, await this._targetClassNameToClassId(sourceRelInfo.classFullName));
+        const result = this.targetDb.createQueryReader(sql, params);
+        if (await result.step())
+            return result.current.id;
+        else
+            return undefined;
     }
     _targetClassNameToClassIdCache = new Map();
-    _targetClassNameToClassId(classFullName) {
+    async _targetClassNameToClassId(classFullName) {
         let classId = this._targetClassNameToClassIdCache.get(classFullName);
         if (classId === undefined) {
-            classId = this._getRelClassId(this.targetDb, classFullName);
+            classId = await this._getRelClassId(this.targetDb, classFullName);
             this._targetClassNameToClassIdCache.set(classFullName, classId);
         }
         return classId;
     }
     // NOTE: this doesn't handle remapped element classes,
     // but is only used for relationships rn
-    _getRelClassId(db, classFullName) {
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return db.withPreparedStatement(`
+    async _getRelClassId(db, classFullName) {
+        const sql = `
       SELECT c.ECInstanceId
       FROM ECDbMeta.ECClassDef c
       JOIN ECDbMeta.ECSchemaDef s ON c.Schema.Id=s.ECInstanceId
       WHERE s.Name=? AND c.Name=?
-    `, (stmt) => {
-            const [schemaName, className] = classFullName.indexOf(".") !== -1
-                ? classFullName.split(".")
-                : classFullName.split(":");
-            stmt.bindString(1, schemaName);
-            stmt.bindString(2, className);
-            if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return stmt.getValue(0).getId();
-            (0, core_bentley_1.assert)(false, "relationship was not found");
-        });
-    }
-    _queryElemIdByFedGuid(db, fedGuid) {
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return db.withPreparedStatement("SELECT ECInstanceId FROM Bis.Element WHERE FederationGuid=?", (stmt) => {
-            stmt.bindGuid(1, fedGuid);
-            if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return stmt.getValue(0).getId();
-            else
-                return undefined;
-        });
+    `;
+        const params = new core_common_1.QueryBinder();
+        const [schemaName, className] = classFullName.indexOf(".") !== -1
+            ? classFullName.split(".")
+            : classFullName.split(":");
+        params.bindString(1, schemaName);
+        params.bindString(2, className);
+        const result = db.createQueryReader(sql, params);
+        if (await result.step())
+            return result.current.id;
+        (0, core_bentley_1.assert)(false, "relationship was not found");
+    }
+    // Deprecate?
+    async _queryElemIdByFedGuid(db, fedGuid) {
+        const sql = "SELECT ECInstanceId FROM Bis.Element WHERE FederationGuid=:fedGuid";
+        const params = new core_common_1.QueryBinder().bindString("fedGuid", fedGuid);
+        const reader = db.createQueryReader(sql, params);
+        if (await reader.step()) {
+            return reader.current.ecinstanceid;
+        }
+        return undefined;
     }
     /** Returns `true` if *brute force* delete detections should be run.
      * @note This is only called if [[IModelTransformOptions.forceExternalSourceAspectProvenance]] option is true
@@ -919,7 +927,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @note A subclass can override this method to provide custom transform behavior.
      * @note This can be called more than once for an element in arbitrary order, so it should not have side-effects.
      */
-    onTransformElement(sourceElement) {
+    async onTransformElement(sourceElement) {
         core_bentley_1.Logger.logTrace(loggerCategory, `onTransformElement(${sourceElement.id}) "${sourceElement.getDisplayLabel()}"`);
         const targetElementProps = this.context.cloneElement(sourceElement, { binaryGeometry: this._options.cloneUsingBinaryGeometry });
         // Special case: source element is the root subject
@@ -1035,7 +1043,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             sourceDbChanges.element.insertIds.has(sourceElement.id) ||
             sourceDbChanges.element.updateIds.has(sourceElement.id));
     }
-    completePartiallyCommittedElements() {
+    async completePartiallyCommittedElements() {
         for (const sourceElementId of this._partiallyCommittedElementIds) {
             const sourceElement = this.sourceDb.elements.getElement({
                 id: sourceElementId,
@@ -1046,25 +1054,25 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             if (core_bentley_1.Id64.isInvalid(targetId)) {
                 throw new Error(`source-target element mapping not found for element "${sourceElementId}" when completing partially committed elements. This is a bug.`);
             }
-            const targetProps = this.onTransformElement(sourceElement);
+            const targetProps = await this.onTransformElement(sourceElement);
             this.targetDb.elements.updateElement({ ...targetProps, id: targetId });
         }
     }
-    completePartiallyCommittedAspects() {
+    async completePartiallyCommittedAspects() {
         for (const sourceAspectId of this._partiallyCommittedAspectIds) {
             const sourceAspect = this.sourceDb.elements.getAspect(sourceAspectId);
             const targetAspectId = this.context.findTargetAspectId(sourceAspectId);
             if (core_bentley_1.Id64.isInvalid(targetAspectId)) {
                 throw new Error(`source-target aspect mapping not found for aspect "${sourceAspectId}" when completing partially committed aspects. This is a bug.`);
             }
-            const targetAspectProps = this.onTransformElementAspect(sourceAspect);
+            const targetAspectProps = await this.onTransformElementAspect(sourceAspect);
             this.targetDb.elements.updateAspect({
                 ...targetAspectProps,
                 id: targetAspectId,
             });
         }
     }
-    doAllReferencesExistInTarget(entity) {
+    async doAllReferencesExistInTarget(entity) {
         let allReferencesExist = true;
         for (const referenceId of entity.getReferenceIds()) {
             const referencedEntityId = core_backend_1.EntityReferences.toId64(referenceId);
@@ -1074,7 +1082,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
                 continue;
             }
             if (allReferencesExist &&
-                !core_backend_1.EntityReferences.isValid(this.context.findTargetEntityId(referenceId))) {
+                !core_backend_1.EntityReferences.isValid(await this.context.findTargetEntityId(referenceId))) {
                 // if we care about references existing then we cannot return early and must check all other references.
                 if (this._options.danglingReferencesBehavior === "ignore") {
                     return false;
@@ -1130,6 +1138,10 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @internal do not call, override or implement this, it will be removed
      */
     async preExportElement(sourceElement) {
+        if (!this.hasElementChanged(sourceElement)) {
+            core_bentley_1.Logger.logTrace(loggerCategory, `Skipping unchanged element (${sourceElement.id}, ${sourceElement.getDisplayLabel()}).`);
+            return;
+        }
         const elemClass = sourceElement.constructor;
         const unresolvedReferences = elemClass.requiredReferenceKeys
             .map((referenceKey) => {
@@ -1188,8 +1200,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     /** Override of [IModelExportHandler.onExportElement]($transformer) that imports an element into the target iModel when it is exported from the source iModel.
      * This override calls [[onTransformElement]] and then [IModelImporter.importElement]($transformer) to update the target iModel.
      */
-    onExportElement(sourceElement) {
-        let targetElementId;
+    async onExportElement(sourceElement) {
+        let targetElementId = core_bentley_1.Id64.invalid;
         let targetElementProps;
         if (this._options.wasSourceIModelCopiedToTarget) {
             targetElementId = sourceElement.id;
@@ -1198,14 +1210,14 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         }
         else {
             targetElementId = this.context.findTargetElementId(sourceElement.id);
-            targetElementProps = this.onTransformElement(sourceElement);
+            targetElementProps = await this.onTransformElement(sourceElement);
         }
         // if an existing remapping was not yet found, check by FederationGuid
         if (this.context.isBetweenIModels &&
             !core_bentley_1.Id64.isValid(targetElementId) &&
             sourceElement.federationGuid !== undefined) {
             targetElementId =
-                this._queryElemIdByFedGuid(this.targetDb, sourceElement.federationGuid) ?? core_bentley_1.Id64.invalid;
+                this.targetDb.elements.getIdFromFederationGuid(sourceElement.federationGuid) ?? core_bentley_1.Id64.invalid;
             if (core_bentley_1.Id64.isValid(targetElementId))
                 this.context.remapElement(sourceElement.id, targetElementId); // record that the targetElement was found
         }
@@ -1232,7 +1244,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             core_bentley_1.Logger.logTrace(loggerCategory, `Skipping unchanged element (${sourceElement.id}, ${sourceElement.getDisplayLabel()}).`);
             return;
         }
-        if (!this.doAllReferencesExistInTarget(sourceElement)) {
+        if (!(await this.doAllReferencesExistInTarget(sourceElement))) {
             this._partiallyCommittedElementIds.add(sourceElement.id);
         }
         // targetElementId will be valid (indicating update) or undefined (indicating insert)
@@ -1322,7 +1334,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         this.importer.importModel(targetModelProps);
     }
     /** Override of [IModelExportHandler.onDeleteModel]($transformer) that is called when [IModelExporter]($transformer) detects that a [Model]($backend) has been deleted from the source iModel. */
-    onDeleteModel(sourceModelId) {
+    async onDeleteModel(sourceModelId) {
         // It is possible and apparently occasionally sensical to delete a model without deleting its underlying element.
         // - If only the model is deleted, [[initFromExternalSourceAspects]] will have already remapped the underlying element since it still exists.
         // - If both were deleted, [[remapDeletedSourceEntities]] will find and remap the deleted element making this operation valid
@@ -1339,19 +1351,9 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
       WHERE ECInstanceId=:targetModelId
     `;
         if (this.exporter.sourceDbChanges?.element.deleteIds.has(sourceModelId)) {
-            // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-            const isDefinitionPartition = this.targetDb.withPreparedStatement(sql, (stmt) => {
-                stmt.bindId("targetModelId", targetModelId);
-                const val = stmt.step();
-                switch (val) {
-                    case core_bentley_1.DbResult.BE_SQLITE_ROW:
-                        return true;
-                    case core_bentley_1.DbResult.BE_SQLITE_DONE:
-                        return false;
-                    default:
-                        (0, core_bentley_1.assert)(false, `unexpected db result: '${JSON.stringify(stmt)}'`);
-                }
-            });
+            const params = new core_common_1.QueryBinder().bindId("targetModelId", targetModelId);
+            const reader = this.targetDb.createQueryReader(sql, params);
+            const isDefinitionPartition = await reader.step();
             if (isDefinitionPartition) {
                 // Skipping model deletion because model's partition will also be deleted.
                 // It expects that model will be present and will fail if it's missing.
@@ -1360,7 +1362,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             }
         }
         try {
-            this.importer.deleteModel(targetModelId);
+            await this.importer.deleteModel(targetModelId);
         }
         catch (error) {
             const isDeletionProhibitedErr = error instanceof core_common_1.IModelError &&
@@ -1407,41 +1409,24 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         await this.initialize();
         // import DefinitionModels first
         const childDefinitionPartitionSql = `SELECT ECInstanceId FROM ${core_backend_1.DefinitionPartition.classFullName} WHERE Parent.Id=:subjectId`;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        await this.sourceDb.withPreparedStatement(childDefinitionPartitionSql, 
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        async (statement) => {
-            statement.bindId("subjectId", sourceSubjectId);
-            while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
-                await this.processModel(statement.getValue(0).getId());
-            }
-        });
+        const params = new core_common_1.QueryBinder().bindId("subjectId", sourceSubjectId);
+        for await (const row of this.sourceDb.createQueryReader(childDefinitionPartitionSql, params)) {
+            await this.processModel(row.id);
+        }
         // import other partitions next
         const childPartitionSql = `SELECT ECInstanceId FROM ${core_backend_1.InformationPartitionElement.classFullName} WHERE Parent.Id=:subjectId`;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        await this.sourceDb.withPreparedStatement(childPartitionSql, 
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        async (statement) => {
-            statement.bindId("subjectId", sourceSubjectId);
-            while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
-                const modelId = statement.getValue(0).getId();
-                const model = this.sourceDb.models.getModel(modelId);
-                if (!(model instanceof core_backend_1.DefinitionModel)) {
-                    await this.processModel(modelId);
-                }
+        for await (const row of this.sourceDb.createQueryReader(childPartitionSql, params)) {
+            const modelId = row.id;
+            const model = this.sourceDb.models.getModel(modelId);
+            if (!(model instanceof core_backend_1.DefinitionModel)) {
+                await this.processModel(modelId);
             }
-        });
+        }
         // recurse into child Subjects
         const childSubjectSql = `SELECT ECInstanceId FROM ${core_backend_1.Subject.classFullName} WHERE Parent.Id=:subjectId`;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        await this.sourceDb.withPreparedStatement(childSubjectSql, 
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        async (statement) => {
-            statement.bindId("subjectId", sourceSubjectId);
-            while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
-                await this.processSubjectSubModels(statement.getValue(0).getId());
-            }
-        });
+        for await (const row of this.sourceDb.createQueryReader(childSubjectSql, params)) {
+            await this.processSubjectSubModels(row.id);
+        }
     }
     /** Transform the specified sourceModel into ModelProps for the target iModel.
      * @param sourceModel The Model from the source iModel to be transformed.
@@ -1588,9 +1573,9 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     /** Override of [IModelExportHandler.onExportRelationship]($transformer) that imports a relationship into the target iModel when it is exported from the source iModel.
      * This override calls [[onTransformRelationship]] and then [IModelImporter.importRelationship]($transformer) to update the target iModel.
      */
-    onExportRelationship(sourceRelationship) {
-        const sourceFedGuid = queryElemFedGuid(this.sourceDb, sourceRelationship.sourceId);
-        const targetFedGuid = queryElemFedGuid(this.sourceDb, sourceRelationship.targetId);
+    async onExportRelationship(sourceRelationship) {
+        const sourceFedGuid = this.sourceDb.elements.getFederationGuidFromId(sourceRelationship.sourceId);
+        const targetFedGuid = this.sourceDb.elements.getFederationGuidFromId(sourceRelationship.targetId);
         const targetRelationshipProps = this.onTransformRelationship(sourceRelationship);
         const targetRelationshipInstanceId = this.importer.importRelationship(targetRelationshipProps);
         if (!this._options.noProvenance &&
@@ -1599,7 +1584,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
                 ? sourceFedGuid && targetFedGuid && `${sourceFedGuid}/${targetFedGuid}`
                 : undefined;
             if (!provenance) {
-                const aspectProps = this.initRelationshipProvenance(sourceRelationship, targetRelationshipInstanceId);
+                const aspectProps = await this.initRelationshipProvenance(sourceRelationship, targetRelationshipInstanceId);
                 const foundEsaProps = IModelTransformer.queryScopeExternalSourceAspect(this.provenanceDb, aspectProps);
                 // onExportRelationship doesn't need to call updateAspect if esaProps were found, because relationship provenance doesn't have the same concept of a version as element provenance (which uses last mod time on the elements).
                 if (undefined === foundEsaProps) {
@@ -1662,32 +1647,27 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
       WHERE aspect.Scope.Id=:scopeId
         AND aspect.Kind=:kind
     `;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        await this.targetDb.withPreparedStatement(sql, 
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        async (statement) => {
-            statement.bindId("scopeId", this.targetScopeElementId);
-            statement.bindString("kind", core_backend_1.ExternalSourceAspect.Kind.Relationship);
-            while (core_bentley_1.DbResult.BE_SQLITE_ROW === statement.step()) {
-                const sourceRelInstanceId = core_bentley_1.Id64.fromJSON(statement.getValue(1).getString());
-                if (undefined ===
-                    this.sourceDb.relationships.tryGetInstanceProps(core_backend_1.ElementRefersToElements.classFullName, sourceRelInstanceId)) {
-                    // this function exists only to support some in-imodel transformations, which must
-                    // use the old (external source aspect) provenance method anyway so we don't need to support
-                    // new provenance
-                    const json = JSON.parse(statement.getValue(2).getString());
-                    const targetRelInstanceId = json.targetRelInstanceId ?? json.provenanceRelInstanceId;
-                    if (targetRelInstanceId) {
-                        this.importer.deleteRelationship({
-                            id: targetRelInstanceId,
-                            classFullName: core_backend_1.ElementRefersToElements.classFullName,
-                        });
-                    }
-                    aspectDeleteIds.push(statement.getValue(0).getId());
+        const params = new core_common_1.QueryBinder().bindId("scopeId", this.targetScopeElementId);
+        params.bindString("kind", core_backend_1.ExternalSourceAspect.Kind.Relationship);
+        for await (const row of this.targetDb.createQueryReader(sql, params)) {
+            const sourceRelInstanceId = core_bentley_1.Id64.fromJSON(row[1]);
+            if (undefined ===
+                this.sourceDb.relationships.tryGetInstanceProps(core_backend_1.ElementRefersToElements.classFullName, sourceRelInstanceId)) {
+                // this function exists only to support some in-imodel transformations, which must
+                // use the old (external source aspect) provenance method anyway so we don't need to support
+                // new provenance
+                const json = JSON.parse(row[2]);
+                const targetRelInstanceId = json.targetRelInstanceId ?? json.provenanceRelInstanceId;
+                if (targetRelInstanceId) {
+                    this.importer.deleteRelationship({
+                        id: targetRelInstanceId,
+                        classFullName: core_backend_1.ElementRefersToElements.classFullName,
+                    });
                 }
-                await this._yieldManager.allowYield();
+                aspectDeleteIds.push(row.id);
             }
-        });
+            await this._yieldManager.allowYield();
+        }
         this.targetDb.elements.deleteAspect(aspectDeleteIds);
     }
     /** Transform the specified sourceRelationship into RelationshipProps for the target iModel.
@@ -1700,11 +1680,10 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         targetRelationshipProps.sourceId = this.context.findTargetElementId(sourceRelationship.sourceId);
         targetRelationshipProps.targetId = this.context.findTargetElementId(sourceRelationship.targetId);
         // TODO: move to cloneRelationship in IModelCloneContext
-        sourceRelationship.forEachProperty((propertyName, propertyMetaData) => {
-            if (core_common_1.PrimitiveTypeCode.Long === propertyMetaData.primitiveType &&
-                "Id" === propertyMetaData.extendedType) {
-                targetRelationshipProps[propertyName] =
-                    this.context.findTargetElementId(sourceRelationship.asAny[propertyName]);
+        sourceRelationship.forEach((propertyName, property) => {
+            if (property.isPrimitive() && "Id" === property.extendedTypeName) {
+                targetRelationshipProps[core_common_1.ECJsNames.toJsName(propertyName)] =
+                    this.context.findTargetElementId(sourceRelationship.asAny[core_common_1.ECJsNames.toJsName(propertyName)]);
             }
         });
         return targetRelationshipProps;
@@ -1717,9 +1696,9 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     /** Override of [IModelExportHandler.onExportElementUniqueAspect]($transformer) that imports an ElementUniqueAspect into the target iModel when it is exported from the source iModel.
      * This override calls [[onTransformElementAspect]] and then [IModelImporter.importElementUniqueAspect]($transformer) to update the target iModel.
      */
-    onExportElementUniqueAspect(sourceAspect) {
-        const targetAspectProps = this.onTransformElementAspect(sourceAspect);
-        if (!this.doAllReferencesExistInTarget(sourceAspect)) {
+    async onExportElementUniqueAspect(sourceAspect) {
+        const targetAspectProps = await this.onTransformElementAspect(sourceAspect);
+        if (!(await this.doAllReferencesExistInTarget(sourceAspect))) {
             this._partiallyCommittedAspectIds.add(sourceAspect.id);
         }
         const targetId = this.importer.importElementUniqueAspect(targetAspectProps);
@@ -1729,16 +1708,16 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * This override calls [[onTransformElementAspect]] for each ElementMultiAspect and then [IModelImporter.importElementMultiAspects]($transformer) to update the target iModel.
      * @note ElementMultiAspects are handled as a group to make it easier to differentiate between insert, update, and delete.
      */
-    onExportElementMultiAspects(sourceAspects) {
+    async onExportElementMultiAspects(sourceAspects) {
         // Transform source ElementMultiAspects into target ElementAspectProps
-        const targetAspectPropsArray = sourceAspects.map((srcA) => this.onTransformElementAspect(srcA));
-        sourceAspects.forEach((a) => {
-            if (!this.doAllReferencesExistInTarget(a)) {
+        const targetAspectPropsArray = sourceAspects.map(async (srcA) => await this.onTransformElementAspect(srcA));
+        sourceAspects.forEach(async (a) => {
+            if (!(await this.doAllReferencesExistInTarget(a))) {
                 this._partiallyCommittedAspectIds.add(a.id);
             }
         });
         // const targetAspectsToImport = targetAspectPropsArray.filter((targetAspect, i) => hasEntityChanged(sourceAspects[i], targetAspect));
-        const targetIds = this.importer.importElementMultiAspects(targetAspectPropsArray, (a) => {
+        const targetIds = this.importer.importElementMultiAspects(await Promise.all(targetAspectPropsArray), (a) => {
             const isExternalSourceAspectFromTransformer = a instanceof core_backend_1.ExternalSourceAspect &&
                 a.scope?.id === this.targetScopeElementId;
             return (!this._options.includeSourceProvenance ||
@@ -1753,8 +1732,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @returns ElementAspectProps for the target iModel.
      * @note A subclass can override this method to provide custom transform behavior.
      */
-    onTransformElementAspect(sourceElementAspect) {
-        const targetElementAspectProps = this.context.cloneElementAspect(sourceElementAspect);
+    async onTransformElementAspect(sourceElementAspect) {
+        const targetElementAspectProps = await this.context.cloneElementAspect(sourceElementAspect);
         return targetElementAspectProps;
     }
     /** The directory where schemas will be exported, a random temporary directory */
@@ -1796,7 +1775,6 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             nodeAssert(schemaFileName.length <= systemMaxPathSegmentSize, "Schema name was still long. This is a bug.");
             this._longNamedSchemasMap.set(schema.name, schemaFileName);
         }
-        /* eslint-disable-next-line @typescript-eslint/no-deprecated */
         this.sourceDb.exportSchema({
             schemaName: schema.name,
             outputDirectory: this._schemaExportDir,
@@ -1884,8 +1862,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         this.context.remapElement(sourceSubjectId, targetSubjectId);
         await this.processChildElements(sourceSubjectId);
         await this.processSubjectSubModels(sourceSubjectId);
-        this.completePartiallyCommittedElements();
-        this.completePartiallyCommittedAspects();
+        await this.completePartiallyCommittedElements();
+        await this.completePartiallyCommittedAspects();
     }
     /** state to prevent reinitialization, @see [[initialize]] */
     _initialized = false;
@@ -1901,7 +1879,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     async initialize() {
         if (this._initialized)
             return;
-        this.initScopeProvenance();
+        await this.initScopeProvenance();
         await this._tryInitChangesetData(this._options.argsForProcessChanges);
         await this.context.initialize();
         // need exporter initialized to do remapdeletedsourceentities.
@@ -1917,7 +1895,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @returns void
      */
     async processChangesets() {
-        this.forEachTrackedElement((sourceElementId, targetElementId) => {
+        await this.forEachTrackedElement((sourceElementId, targetElementId) => {
             this.context.remapElement(sourceElementId, targetElementId);
         });
         if (this.exporter.sourceDbChanges)
@@ -2055,7 +2033,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             }
             // Check for targetId using sourceId's fedguid if we didn't find an esa.
             if (fedGuid) {
-                const targetId = this._queryElemIdByFedGuid(this.targetDb, fedGuid);
+                const targetId = this.targetDb.elements.getIdFromFederationGuid(fedGuid);
                 return targetId;
             }
             return undefined;
@@ -2075,7 +2053,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
                 });
             }
             else if (this.sourceDb === this.provenanceSourceDb) {
-                const relProvenance = this._queryProvenanceForRelationship(changedInstanceId, {
+                const relProvenance = await this._queryProvenanceForRelationship(changedInstanceId, {
                     classFullName: classFullName ?? "",
                     sourceId: sourceIdOfRelationshipInSource,
                     targetId: targetIdOfRelationshipInSource,
@@ -2091,7 +2069,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         else {
             let targetId = await getTargetIdFromSourceId(changedInstanceId);
             if (targetId === undefined && this.sourceDb === this.provenanceSourceDb) {
-                targetId = this._queryProvenanceForElement(changedInstanceId);
+                targetId = await this._queryProvenanceForElement(changedInstanceId);
             }
             // since we are processing one changeset at a time, we can see local source deletes
             // of entities that were never synced and can be safely ignored
@@ -2136,7 +2114,6 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             ? indexOrId
             : core_backend_1.BriefcaseManager.queryChangeset({
                 iModelId: this.sourceDb.iModelId,
-                // eslint-disable-next-line @typescript-eslint/no-deprecated
                 changeset: { id: indexOrId },
             }).then((changeset) => changeset.index)));
         const missingChangesets = startChangesetIndex > this.synchronizationVersion.index + 1;
@@ -2221,9 +2198,9 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         else {
             await this.exporter.exportModel(core_common_1.IModel.repositoryModelId);
         }
-        this.completePartiallyCommittedElements();
+        await this.completePartiallyCommittedElements();
         await this.exporter["exportAllAspects"](); // eslint-disable-line @typescript-eslint/dot-notation
-        this.completePartiallyCommittedAspects();
+        await this.completePartiallyCommittedAspects();
         await this.exporter.exportRelationships(core_backend_1.ElementRefersToElements.classFullName);
         if (this._options.forceExternalSourceAspectProvenance &&
             this.shouldDetectDeletes()) {
@@ -2264,8 +2241,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     async processChanges(options) {
         // must wait for initialization of synchronization provenance data
         await this.exporter.exportChanges(this.getExportInitOpts(options));
-        this.completePartiallyCommittedElements();
-        this.completePartiallyCommittedAspects();
+        await this.completePartiallyCommittedElements();
+        await this.completePartiallyCommittedAspects();
         if (this._options.optimizeGeometry)
             this.importer.optimizeGeometry(this._options.optimizeGeometry);
         this.importer.computeProjectExtents();
@@ -2373,11 +2350,11 @@ class TemplateModelCloner extends IModelTransformer {
         return this._sourceIdToTargetIdMap; // return the sourceElementId -> targetElementId Map in case further post-processing is required.
     }
     /** Cloning from a template requires this override of onTransformElement. */
-    onTransformElement(sourceElement) {
+    async onTransformElement(sourceElement) {
         const referenceIds = sourceElement.getReferenceIds();
-        referenceIds.forEach((referenceId) => {
+        for (const referenceId of referenceIds) {
             // TODO: consider going through all definition elements at once and remapping them to themselves
-            if (!core_backend_1.EntityReferences.isValid(this.context.findTargetEntityId(referenceId))) {
+            if (!core_backend_1.EntityReferences.isValid(await this.context.findTargetEntityId(referenceId))) {
                 if (this.context.isBetweenIModels) {
                     throw new core_common_1.IModelError(core_bentley_1.IModelStatus.BadRequest, `Remapping for source dependency ${referenceId} not found for target iModel`);
                 }
@@ -2392,8 +2369,8 @@ class TemplateModelCloner extends IModelTransformer {
                     }
                 }
             }
-        });
-        const targetElementProps = super.onTransformElement(sourceElement);
+        }
+        const targetElementProps = await super.onTransformElement(sourceElement);
         targetElementProps.federationGuid = core_bentley_1.Guid.createValue(); // clone from template should create a new federationGuid
         targetElementProps.code = core_common_1.Code.createEmpty(); // clone from template should not maintain codes
         if (sourceElement instanceof core_backend_1.GeometricElement) {
@@ -2411,6 +2388,7 @@ class TemplateModelCloner extends IModelTransformer {
     }
 }
 exports.TemplateModelCloner = TemplateModelCloner;
+//Deprecate in preference of imodeldb.elements.getFederationGuidFromId()?
 function queryElemFedGuid(db, elemId) {
     // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
     return db.withPreparedStatement(`