@itwin/imodel-transformer 2.0.0-dev.14 → 2.0.0-dev.16

package/lib/cjs/IModelTransformer.js

@@ -93,12 +93,18 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     _partiallyCommittedElementIds = new Set();
     _partiallyCommittedAspectIds = new Set();
     /**
-     * Tracks target element IDs that were imported (inserted or updated) during the current
+     * Tracks target element IDs that were remapped by Code during the current
      * transformation pass. Used to prevent deletion of target elements that have been remapped
      * to a new source element in the same pass (e.g., when a source element is deleted and a
      * new one with the same properties is added, causing a remap to the same target).
      */
-    _targetElementsImportedInCurrentTransform = new Set();
+    _targetElementIdsRemappedByCode = new Set();
+    /**
+     * Tracks target model IDs that were imported (inserted or updated) during the current
+     * transformation pass. Used to prevent deletion of target models that have been recreated
+     * in the same pass (e.g. when a partition element is recreated with a new model).
+     */
+    _targetModelsImportedInCurrentTransform = new Set();
     /** the options that were used to initialize this transformer */
     _options;
     _changesetRanges = undefined;
@@ -638,6 +644,7 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
                     // ensure code remapping doesn't change the target class
                     targetElementId = maybeTargetElementId;
                     this.context.remapElement(sourceElement.id, targetElementId); // record that the targetElement was found by Code
+                    this._targetElementIdsRemappedByCode.add(targetElementId);
                 }
                 else {
                     targetElementProps.code = core_common_1.Code.createEmpty(); // clear out invalid code
@@ -684,7 +691,6 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         if (targetElementProps.id === undefined) {
             throw new core_common_1.IModelError(core_bentley_1.IModelStatus.BadElement, "targetElementProps.id should be assigned by importElement");
         }
-        this._targetElementsImportedInCurrentTransform.add(targetElementProps.id);
         this.context.remapElement(sourceElement.id, targetElementProps.id);
         // the transformer does not currently 'split' or 'join' any elements, therefore, it does not
         // insert external source aspects because federation guids are sufficient for this.
@@ -720,9 +726,9 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
     async onDeleteElement(sourceElementId) {
         const targetElementId = this.context.findTargetElementId(sourceElementId);
         if (core_bentley_1.Id64.isValidId64(targetElementId)) {
-            // Skip deletion if this target element was already imported (inserted/updated) during
+            // Skip deletion if new / updated source element was remapped to it by Code during
             // this transformation pass.
-            if (!this._targetElementsImportedInCurrentTransform.has(targetElementId)) {
+            if (!this._targetElementIdsRemappedByCode.has(targetElementId)) {
                 await this.importer.deleteElement(targetElementId);
             }
         }
@@ -742,6 +748,10 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
             return;
         const targetModelProps = this.onTransformModel(sourceModel, targetModeledElementId);
         await this.importer.importModel(targetModelProps);
+        if (targetModelProps.id === undefined) {
+            throw new core_common_1.IModelError(core_bentley_1.IModelStatus.BadModel, "targetModelProps.id should be assigned by now");
+        }
+        this._targetModelsImportedInCurrentTransform.add(targetModelProps.id);
     }
     /** Override of [IModelExportHandler.onDeleteModel]($transformer) that is called when [IModelExporter]($transformer) detects that a [Model]($backend) has been deleted from the source iModel. */
     async onDeleteModel(sourceModelId) {
@@ -751,6 +761,13 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
         const targetModelId = this.context.findTargetElementId(sourceModelId);
         if (!core_bentley_1.Id64.isValidId64(targetModelId))
             return;
+        // This handles cases where model with a partition element was remapped to
+        //  new element by code value after recreation.
+        if (this._targetElementIdsRemappedByCode.has(targetModelId) &&
+            this._targetModelsImportedInCurrentTransform.has(targetModelId)) {
+            core_bentley_1.Logger.logTrace(loggerCategory, `Skipping delete operation for model (source id: ${sourceModelId}) because the target model (id: ${targetModelId}) was remapped by Code and re-imported during this transformation pass.`);
+            return;
+        }
         const sql = `
       SELECT 1
       FROM bis.DefinitionPartition
@@ -1480,7 +1497,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @note [[processSchemas]] is not called automatically since the target iModel may want a different collection of schemas.
      */
     async processAll() {
-        this._targetElementsImportedInCurrentTransform.clear();
+        this._targetElementIdsRemappedByCode.clear();
+        this._targetModelsImportedInCurrentTransform.clear();
         // processAll always has changes to process, so mark it as such for version tracking
         this._sourceChangeDataState = "has-changes";
         await this.exporter.exportCodeSpecs();
@@ -1517,7 +1535,8 @@ class IModelTransformer extends IModelExporter_1.IModelExportHandler {
      * @note To form a range of versions to process, set `startChangesetId` for the start (inclusive) of the desired range and open the source iModel as of the end (inclusive) of the desired range.
      */
     async processChanges(options) {
-        this._targetElementsImportedInCurrentTransform.clear();
+        this._targetElementIdsRemappedByCode.clear();
+        this._targetModelsImportedInCurrentTransform.clear();
         // must wait for initialization of synchronization provenance data
         await this.exporter.exportChanges(await this.getExportInitOpts(options));
         await this.completePartiallyCommittedElements();