@itwin/imodel-transformer 2.0.0-dev.5 → 2.0.0-dev.50

package/lib/cjs/EntityExistenceCache.js

@@ -0,0 +1,91 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Utils
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityExistenceCache = void 0;
+const EntityUnifier_1 = require("./EntityUnifier");
+/** A positive-only read-through cache of entity existence checks, scoped to a single transformation run.
+ *
+ * Entities are created continuously as a transformation progresses, so a negative
+ * ("does not exist") result may become stale at any moment — therefore only positive
+ * results are ever cached. Positive results can only be invalidated by deletes, which the
+ * transformer routes through [[invalidate]] and [[clearDb]].
+ *
+ * The cache is keyed by [IModelDb]($core-backend) instance, so same-iModel transformations
+ * (where sourceDb === targetDb) share a single set and source/target roles cannot be confused.
+ *
+ * [IModelImporter]($transformer) delete operations invalidate registered caches. Deletes performed
+ * directly through an `EditTxn` while a transformation is active are out-of-band and must not be
+ * mixed with transformer operations. A successful high-level `process()` clears the cache when the
+ * transformation finalizes; low-level or failed transformations clear it when the transformer is
+ * disposed.
+ * @internal
+ */
+class EntityExistenceCache {
+    _existsByDb = new Map();
+    getDbSet(db) {
+        let set = this._existsByDb.get(db);
+        if (set === undefined) {
+            set = new Set();
+            this._existsByDb.set(db, set);
+        }
+        return set;
+    }
+    /** Check whether an entity exists in `db`, consulting the cache first.
+     * A `true` result is cached; a `false` result is never cached and will be re-queried.
+     */
+    async exists(db, entityReference) {
+        const set = this.getDbSet(db);
+        if (set.has(entityReference))
+            return true;
+        const found = await EntityUnifier_1.EntityUnifier.exists(db, { entityReference });
+        if (found)
+            set.add(entityReference);
+        return found;
+    }
+    /** Read through the cache to check which of the supplied entities exist in `db`, populating it on a miss. */
+    async existsAll(db, entityReferences) {
+        const dbSet = this.getDbSet(db);
+        const found = new Set();
+        const unverified = [];
+        for (const entityReference of entityReferences) {
+            if (dbSet.has(entityReference))
+                found.add(entityReference);
+            else
+                unverified.push(entityReference);
+        }
+        if (unverified.length === 0)
+            return found;
+        const queried = await EntityUnifier_1.EntityUnifier.existsAll(db, unverified);
+        for (const entityReference of queried) {
+            dbSet.add(entityReference);
+            found.add(entityReference);
+        }
+        return found;
+    }
+    /** Record that an entity is known to exist in `db` (e.g. it was just imported). */
+    markExists(db, entityReference) {
+        this.getDbSet(db).add(entityReference);
+    }
+    /** Remove a single entity from the cache for `db`, forcing a re-query on next check. */
+    invalidate(db, entityReference) {
+        this._existsByDb.get(db)?.delete(entityReference);
+    }
+    /** Drop all cached results for `db`. Used when a delete may cascade to entities the
+     * caller cannot enumerate (e.g. element tree deletes that remove descendants and submodels).
+     */
+    clearDb(db) {
+        this._existsByDb.delete(db);
+    }
+    /** Drop all cached results. */
+    clear() {
+        this._existsByDb.clear();
+    }
+}
+exports.EntityExistenceCache = EntityExistenceCache;
+//# sourceMappingURL=EntityExistenceCache.js.map

package/lib/cjs/EntityExistenceCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityExistenceCache.js","sourceRoot":"","sources":["../../src/EntityExistenceCache.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAIH,mDAAgD;AAEhD;;;;;;;;;;;;;;;;GAgBG;AACH;IACU,WAAW,GAAG,IAAI,GAAG,EAAkC,CAAC;IAExD,QAAQ,CAAC,EAAY;QAC3B,IAAI,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM,CACjB,EAAY,EACZ,eAAgC;QAEhC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,6BAAa,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;QAClE,IAAI,KAAK;YAAE,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,6GAA6G;IACtG,KAAK,CAAC,SAAS,CACpB,EAAY,EACZ,gBAA2C;QAE3C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACzC,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;YAC/C,IAAI,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;;gBACtD,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAE1C,MAAM,OAAO,GAAG,MAAM,6BAAa,CAAC,SAAS,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAC9D,KAAK,MAAM,eAAe,IAAI,OAAO,EAAE,CAAC;YACtC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mFAAmF;IAC5E,UAAU,CAAC,EAAY,EAAE,eAAgC;QAC9D,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,wFAAwF;IACjF,UAAU,CAAC,EAAY,EAAE,eAAgC;QAC9D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACI,OAAO,CAAC,EAAY;QACzB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,+BAA+B;IACxB,KAAK;QACV,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Utils\n */\n\nimport { EntityReference } from \"@itwin/core-common\";\nimport { IModelDb } from \"@itwin/core-backend\";\nimport { EntityUnifier } from \"./EntityUnifier\";\n\n/** A positive-only read-through cache of entity existence checks, scoped to a single transformation run.\n *\n * Entities are created continuously as a transformation progresses, so a negative\n * (\"does not exist\") result may become stale at any moment — therefore only positive\n * results are ever cached. Positive results can only be invalidated by deletes, which the\n * transformer routes through [[invalidate]] and [[clearDb]].\n *\n * The cache is keyed by [IModelDb]($core-backend) instance, so same-iModel transformations\n * (where sourceDb === targetDb) share a single set and source/target roles cannot be confused.\n *\n * [IModelImporter]($transformer) delete operations invalidate registered caches. Deletes performed\n * directly through an `EditTxn` while a transformation is active are out-of-band and must not be\n * mixed with transformer operations. A successful high-level `process()` clears the cache when the\n * transformation finalizes; low-level or failed transformations clear it when the transformer is\n * disposed.\n * @internal\n */\nexport class EntityExistenceCache {\n  private _existsByDb = new Map<IModelDb, Set<EntityReference>>();\n\n  private getDbSet(db: IModelDb): Set<EntityReference> {\n    let set = this._existsByDb.get(db);\n    if (set === undefined) {\n      set = new Set();\n      this._existsByDb.set(db, set);\n    }\n    return set;\n  }\n\n  /** Check whether an entity exists in `db`, consulting the cache first.\n   * A `true` result is cached; a `false` result is never cached and will be re-queried.\n   */\n  public async exists(\n    db: IModelDb,\n    entityReference: EntityReference\n  ): Promise<boolean> {\n    const set = this.getDbSet(db);\n    if (set.has(entityReference)) return true;\n    const found = await EntityUnifier.exists(db, { entityReference });\n    if (found) set.add(entityReference);\n    return found;\n  }\n\n  /** Read through the cache to check which of the supplied entities exist in `db`, populating it on a miss. */\n  public async existsAll(\n    db: IModelDb,\n    entityReferences: Iterable<EntityReference>\n  ): Promise<ReadonlySet<EntityReference>> {\n    const dbSet = this.getDbSet(db);\n    const found = new Set<EntityReference>();\n    const unverified: EntityReference[] = [];\n\n    for (const entityReference of entityReferences) {\n      if (dbSet.has(entityReference)) found.add(entityReference);\n      else unverified.push(entityReference);\n    }\n\n    if (unverified.length === 0) return found;\n\n    const queried = await EntityUnifier.existsAll(db, unverified);\n    for (const entityReference of queried) {\n      dbSet.add(entityReference);\n      found.add(entityReference);\n    }\n    return found;\n  }\n\n  /** Record that an entity is known to exist in `db` (e.g. it was just imported). */\n  public markExists(db: IModelDb, entityReference: EntityReference): void {\n    this.getDbSet(db).add(entityReference);\n  }\n\n  /** Remove a single entity from the cache for `db`, forcing a re-query on next check. */\n  public invalidate(db: IModelDb, entityReference: EntityReference): void {\n    this._existsByDb.get(db)?.delete(entityReference);\n  }\n\n  /** Drop all cached results for `db`. Used when a delete may cascade to entities the\n   * caller cannot enumerate (e.g. element tree deletes that remove descendants and submodels).\n   */\n  public clearDb(db: IModelDb): void {\n    this._existsByDb.delete(db);\n  }\n\n  /** Drop all cached results. */\n  public clear(): void {\n    this._existsByDb.clear();\n  }\n}\n"]}

package/lib/cjs/EntityMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityMap.d.ts","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAoB,MAAM,qBAAqB,CAAC;AAGvE,gBAAgB;AAChB,MAAM,MAAM,SAAS,GAAG,eAAe,CAAC;AAExC,gBAAgB;AAChB,qBAAa,SAAS,CAAC,CAAC;IACtB,OAAO,CAAC,IAAI,CAAmB;WAEjB,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS;IAIjD,KAAK,IAAI,IAAI;IAIb,GAAG,CAAC,MAAM,EAAE,cAAc;IAI1B,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAIjD,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAK5C,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,CAAC,GAAG,SAAS;IAI1C,QAAQ,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,GAAG,SAAS;IAIrC,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IAIvC,WAAW,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO;IAIlC,IAAI;IAIJ,MAAM;IAIN,OAAO;IAIP,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIxB,IAAW,IAAI,WAEd;CACF"}
+{"version":3,"file":"EntityMap.d.ts","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAoB,MAAM,qBAAqB,CAAC;AAGvE,gBAAgB;AAChB,MAAM,MAAM,SAAS,GAAG,eAAe,CAAC;AAExC,gBAAgB;AAChB,qBAAa,SAAS,CAAC,CAAC;IACtB,OAAO,CAAC,IAAI,CAAmB;IAE/B,OAAc,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,CAEvD;IAEM,KAAK,IAAI,IAAI,CAEnB;IAEM,GAAG,CAAC,MAAM,EAAE,cAAc,WAEhC;IAEM,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAEvD;IAEM,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAGlD;IAEM,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,CAAC,GAAG,SAAS,CAEhD;IAEM,QAAQ,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,GAAG,SAAS,CAE3C;IAEM,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAE7C;IAEM,WAAW,CAAC,CAAC,EAAE,SAAS,GAAG,OAAO,CAExC;IAEM,IAAI,wBAEV;IAEM,MAAM,mBAEZ;IAEM,OAAO,6BAEb;IAEM,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAEvB;IAED,IAAW,IAAI,WAEd;CACF"}

package/lib/cjs/EntityMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityMap.js","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":";;;AAQA,sDAAuE;AACvE,qCAAkC;AAKlC,gBAAgB;AAChB,MAAa,SAAS;IACZ,IAAI,GAAG,IAAI,eAAM,EAAK,CAAC;IAExB,MAAM,CAAC,OAAO,CAAC,MAAsB;QAC1C,OAAO,+BAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,GAAG,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,GAAG,CAAC,MAAsB,EAAE,GAAM;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;IAEM,QAAQ,CAAC,CAAY,EAAE,GAAM;QAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,GAAG,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,QAAQ,CAAC,CAAY;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,MAAsB;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,WAAW,CAAC,CAAY;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtC,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AA3DD,8BA2DC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Utils\n */\nimport { EntityReference } from \"@itwin/core-common\";\nimport { ConcreteEntity, EntityReferences } from \"@itwin/core-backend\";\nimport { BigMap } from \"./BigMap\";\n\n/** @internal */\nexport type EntityKey = EntityReference;\n\n/** @internal */\nexport class EntityMap<V> {\n  private _map = new BigMap<V>();\n\n  public static makeKey(entity: ConcreteEntity): EntityKey {\n    return EntityReferences.from(entity);\n  }\n\n  public clear(): void {\n    return this._map.clear();\n  }\n\n  public has(entity: ConcreteEntity) {\n    return this._map.has(EntityMap.makeKey(entity));\n  }\n\n  public set(entity: ConcreteEntity, val: V): EntityMap<V> {\n    return this.setByKey(EntityMap.makeKey(entity), val);\n  }\n\n  public setByKey(k: EntityKey, val: V): EntityMap<V> {\n    this._map.set(k, val);\n    return this;\n  }\n\n  public get(entity: ConcreteEntity): V | undefined {\n    return this.getByKey(EntityMap.makeKey(entity));\n  }\n\n  public getByKey(k: EntityKey): V | undefined {\n    return this._map.get(k);\n  }\n\n  public delete(entity: ConcreteEntity): boolean {\n    return this.deleteByKey(EntityMap.makeKey(entity));\n  }\n\n  public deleteByKey(k: EntityKey): boolean {\n    return this._map.delete(k);\n  }\n\n  public keys() {\n    return this._map.keys();\n  }\n\n  public values() {\n    return this._map.values();\n  }\n\n  public entries() {\n    return this._map.entries();\n  }\n\n  public [Symbol.iterator]() {\n    return this._map[Symbol.iterator]();\n  }\n\n  public get size() {\n    return this._map.size;\n  }\n}\n"]}
+{"version":3,"file":"EntityMap.js","sourceRoot":"","sources":["../../src/EntityMap.ts"],"names":[],"mappings":";;;AAQA,sDAAuE;AACvE,qCAAkC;AAKlC,gBAAgB;AAChB;IACU,IAAI,GAAG,IAAI,eAAM,EAAK,CAAC;IAExB,MAAM,CAAC,OAAO,CAAC,MAAsB;QAC1C,OAAO,+BAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEM,GAAG,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,GAAG,CAAC,MAAsB,EAAE,GAAM;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;IAEM,QAAQ,CAAC,CAAY,EAAE,GAAM;QAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,GAAG,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,QAAQ,CAAC,CAAY;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,MAAsB;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,WAAW,CAAC,CAAY;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IACtC,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Utils\n */\nimport { EntityReference } from \"@itwin/core-common\";\nimport { ConcreteEntity, EntityReferences } from \"@itwin/core-backend\";\nimport { BigMap } from \"./BigMap\";\n\n/** @internal */\nexport type EntityKey = EntityReference;\n\n/** @internal */\nexport class EntityMap<V> {\n  private _map = new BigMap<V>();\n\n  public static makeKey(entity: ConcreteEntity): EntityKey {\n    return EntityReferences.from(entity);\n  }\n\n  public clear(): void {\n    return this._map.clear();\n  }\n\n  public has(entity: ConcreteEntity) {\n    return this._map.has(EntityMap.makeKey(entity));\n  }\n\n  public set(entity: ConcreteEntity, val: V): EntityMap<V> {\n    return this.setByKey(EntityMap.makeKey(entity), val);\n  }\n\n  public setByKey(k: EntityKey, val: V): EntityMap<V> {\n    this._map.set(k, val);\n    return this;\n  }\n\n  public get(entity: ConcreteEntity): V | undefined {\n    return this.getByKey(EntityMap.makeKey(entity));\n  }\n\n  public getByKey(k: EntityKey): V | undefined {\n    return this._map.get(k);\n  }\n\n  public delete(entity: ConcreteEntity): boolean {\n    return this.deleteByKey(EntityMap.makeKey(entity));\n  }\n\n  public deleteByKey(k: EntityKey): boolean {\n    return this._map.delete(k);\n  }\n\n  public keys() {\n    return this._map.keys();\n  }\n\n  public values() {\n    return this._map.values();\n  }\n\n  public entries() {\n    return this._map.entries();\n  }\n\n  public [Symbol.iterator]() {\n    return this._map[Symbol.iterator]();\n  }\n\n  public get size() {\n    return this._map.size;\n  }\n}\n"]}

package/lib/cjs/EntityUnifier.d.ts

@@ -4,18 +4,18 @@
  * for entity-generic operations in the transformer
  */
 import { EntityReference } from "@itwin/core-common";
-import { ConcreteEntity, ConcreteEntityProps, IModelDb } from "@itwin/core-backend";
+import { ConcreteEntity, IModelDb } from "@itwin/core-backend";
 /** @internal */
 export declare namespace EntityUnifier {
-    export function getReadableType(entity: ConcreteEntity): "element" | "element aspect" | "relationship" | "unknown entity type";
-    type EntityUpdater = (entityProps: ConcreteEntityProps) => void;
-    /** needs to return a widened type otherwise typescript complains when result is used with a narrow type */
-    export function updaterFor(db: IModelDb, entity: ConcreteEntity): EntityUpdater;
-    export function exists(db: IModelDb, arg: {
+    function getReadableType(entity: ConcreteEntity): "element" | "element aspect" | "relationship" | "unknown entity type";
+    function exists(db: IModelDb, arg: {
         entity: ConcreteEntity;
     } | {
         entityReference: EntityReference;
-    }): boolean;
-    export {};
+    }): Promise<boolean>;
+    /** Batched existence check: returns the subset of `entityReferences` that exist in `db`,
+     * using one query per concrete entity type instead of one query per reference.
+     */
+    function existsAll(db: IModelDb, entityReferences: Iterable<EntityReference>): Promise<Set<EntityReference>>;
 }
 //# sourceMappingURL=EntityUnifier.d.ts.map

package/lib/cjs/EntityUnifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityUnifier.d.ts","sourceRoot":"","sources":["../../src/EntityUnifier.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAGH,OAAO,EAEL,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,mBAAmB,EAKnB,QAAQ,EAET,MAAM,qBAAqB,CAAC;AAG7B,gBAAgB;AAChB,yBAAiB,aAAa,CAAC;IAC7B,MAAM,UAAU,eAAe,CAAC,MAAM,EAAE,cAAc,yEAKrD;IAED,KAAK,aAAa,GAAG,CAAC,WAAW,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAEhE,2GAA2G;IAC3G,MAAM,UAAU,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,iBAc9D;IAED,MAAM,UAAU,MAAM,CACpB,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE;QAAE,MAAM,EAAE,cAAc,CAAA;KAAE,GAAG;QAAE,eAAe,EAAE,eAAe,CAAA;KAAE,WAyBvE;;CACF"}
+{"version":3,"file":"EntityUnifier.d.ts","sourceRoot":"","sources":["../../src/EntityUnifier.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,OAAO,EAEL,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EAMd,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAU7B,gBAAgB;AAChB,yBAAiB,aAAa,CAAC;IAC7B,SAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,yEAKrD;IAED,SAAsB,MAAM,CAC1B,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE;QAAE,MAAM,EAAE,cAAc,CAAA;KAAE,GAAG;QAAE,eAAe,EAAE,eAAe,CAAA;KAAE,oBAqBvE;IAED;;OAEG;IACH,SAAsB,SAAS,CAC7B,EAAE,EAAE,QAAQ,EACZ,gBAAgB,EAAE,QAAQ,CAAC,eAAe,CAAC,GAC1C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CA6B/B;CACF"}

package/lib/cjs/EntityUnifier.js

@@ -10,10 +10,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityUnifier = void 0;
-const assert = require("assert");
 const core_common_1 = require("@itwin/core-common");
 const core_backend_1 = require("@itwin/core-backend");
 const core_bentley_1 = require("@itwin/core-bentley");
+const bisCoreRootClasses = {
+    [core_common_1.ConcreteEntityTypes.Model]: core_backend_1.Model,
+    [core_common_1.ConcreteEntityTypes.Element]: core_backend_1.Element,
+    [core_common_1.ConcreteEntityTypes.ElementAspect]: core_backend_1.ElementAspect,
+    [core_common_1.ConcreteEntityTypes.Relationship]: core_backend_1.Relationship,
+};
 /** @internal */
 var EntityUnifier;
 (function (EntityUnifier) {
@@ -28,40 +33,58 @@ var EntityUnifier;
             return "unknown entity type";
     }
     EntityUnifier.getReadableType = getReadableType;
-    /** needs to return a widened type otherwise typescript complains when result is used with a narrow type */
-    function updaterFor(db, entity) {
-        if (entity instanceof core_backend_1.Element)
-            return db.elements.updateElement.bind(db.elements);
-        else if (entity instanceof core_backend_1.Relationship)
-            return db.relationships.updateInstance.bind(db.relationships);
-        else if (entity instanceof core_backend_1.ElementAspect)
-            return db.elements.updateAspect.bind(db.elements);
-        else
-            assert(false, `unreachable; entity was '${entity.constructor.name}' not an Element, Relationship, or ElementAspect`);
-    }
-    EntityUnifier.updaterFor = updaterFor;
-    function exists(db, arg) {
-        const [type, id] = "entityReference" in arg
-            ? core_backend_1.EntityReferences.split(arg.entityReference)
-            : [undefined, arg.entity.id];
-        const classFullName = "entityReference" in arg
-            ? // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-non-null-assertion
-                core_common_1.ConcreteEntityTypes.toBisCoreRootClassFullName(type)
-            : `[${arg.entity.schemaName}].[${arg.entity.className}]`;
-        if (id === undefined || core_bentley_1.Id64.isInvalid(id))
+    async function exists(db, arg) {
+        let classFullName;
+        let id;
+        if ("entityReference" in arg) {
+            const [type, entityId] = core_backend_1.EntityReferences.split(arg.entityReference);
+            classFullName = bisCoreRootClasses[type].classFullName;
+            id = entityId;
+        }
+        else {
+            classFullName = `[${arg.entity.schemaName}].[${arg.entity.className}]`;
+            id = arg.entity.id;
+        }
+        if (core_bentley_1.Id64.isInvalid(id))
             return false;
-        // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-        return db.withPreparedStatement(`SELECT 1 FROM ${classFullName} WHERE ECInstanceId=?`, (stmt) => {
-            stmt.bindId(1, id);
-            const matchesResult = stmt.step();
-            if (matchesResult === core_bentley_1.DbResult.BE_SQLITE_ROW)
-                return true;
-            if (matchesResult === core_bentley_1.DbResult.BE_SQLITE_DONE)
-                return false;
-            else
-                throw new core_common_1.IModelError(matchesResult, "query failed");
+        const query = `SELECT 1 FROM ${classFullName} WHERE ECInstanceId=:id`;
+        const params = new core_common_1.QueryBinder().bindId("id", id);
+        const reader = db.createQueryReader(query, params, {
+            usePrimaryConn: true,
         });
+        return reader.step();
     }
     EntityUnifier.exists = exists;
+    /** Batched existence check: returns the subset of `entityReferences` that exist in `db`,
+     * using one query per concrete entity type instead of one query per reference.
+     */
+    async function existsAll(db, entityReferences) {
+        const idsByType = new Map();
+        for (const entityReference of entityReferences) {
+            const [type, id] = core_backend_1.EntityReferences.split(entityReference);
+            if (core_bentley_1.Id64.isInvalid(id))
+                continue;
+            let ids = idsByType.get(type);
+            if (ids === undefined) {
+                ids = new Set();
+                idsByType.set(type, ids);
+            }
+            ids.add(id);
+        }
+        const found = new Set();
+        for (const [type, ids] of idsByType) {
+            const classFullName = bisCoreRootClasses[type].classFullName;
+            const query = `SELECT ECInstanceId FROM ${classFullName} WHERE InVirtualSet(:ids, ECInstanceId)`;
+            const params = new core_common_1.QueryBinder().bindIdSet("ids", core_bentley_1.OrderedId64Iterable.sortArray([...ids]));
+            const reader = db.createQueryReader(query, params, {
+                usePrimaryConn: true,
+            });
+            while (await reader.step()) {
+                found.add(core_backend_1.EntityReferences.fromEntityType(reader.current[0], type));
+            }
+        }
+        return found;
+    }
+    EntityUnifier.existsAll = existsAll;
 })(EntityUnifier || (exports.EntityUnifier = EntityUnifier = {}));
 //# sourceMappingURL=EntityUnifier.js.map

package/lib/cjs/EntityUnifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityUnifier.js","sourceRoot":"","sources":["../../src/EntityUnifier.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;;;GAIG;;;AAEH,iCAAiC;AACjC,oDAI4B;AAC5B,sDAS6B;AAC7B,sDAAqD;AAErD,gBAAgB;AAChB,IAAiB,aAAa,CAuD7B;AAvDD,WAAiB,aAAa;IAC5B,SAAgB,eAAe,CAAC,MAAsB;QACpD,IAAI,MAAM,YAAY,sBAAO;YAAE,OAAO,SAAS,CAAC;aAC3C,IAAI,MAAM,YAAY,4BAAa;YAAE,OAAO,gBAAgB,CAAC;aAC7D,IAAI,MAAM,YAAY,2BAAY;YAAE,OAAO,cAAc,CAAC;;YAC1D,OAAO,qBAAqB,CAAC;IACpC,CAAC;IALe,6BAAe,kBAK9B,CAAA;IAID,2GAA2G;IAC3G,SAAgB,UAAU,CAAC,EAAY,EAAE,MAAsB;QAC7D,IAAI,MAAM,YAAY,sBAAO;YAC3B,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAkB,CAAC;aACjE,IAAI,MAAM,YAAY,2BAAY;YACrC,OAAO,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CACzC,EAAE,CAAC,aAAa,CACA,CAAC;aAChB,IAAI,MAAM,YAAY,4BAAa;YACtC,OAAO,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAkB,CAAC;;YAEnE,MAAM,CACJ,KAAK,EACL,4BAA4B,MAAM,CAAC,WAAW,CAAC,IAAI,kDAAkD,CACtG,CAAC;IACN,CAAC;IAde,wBAAU,aAczB,CAAA;IAED,SAAgB,MAAM,CACpB,EAAY,EACZ,GAAsE;QAEtE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GACd,iBAAiB,IAAI,GAAG;YACtB,CAAC,CAAC,+BAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;YAC7C,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,aAAa,GACjB,iBAAiB,IAAI,GAAG;YACtB,CAAC,CAAC,wFAAwF;gBACxF,iCAAmB,CAAC,0BAA0B,CAAC,IAAK,CAAC;YACvD,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,MAAM,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC;QAE7D,IAAI,EAAE,KAAK,SAAS,IAAI,mBAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,OAAO,KAAK,CAAC;QAEzD,gFAAgF;QAChF,OAAO,EAAE,CAAC,qBAAqB,CAC7B,iBAAiB,aAAa,uBAAuB,EACrD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,aAAa,KAAK,uBAAQ,CAAC,aAAa;gBAAE,OAAO,IAAI,CAAC;YAC1D,IAAI,aAAa,KAAK,uBAAQ,CAAC,cAAc;gBAAE,OAAO,KAAK,CAAC;;gBACvD,MAAM,IAAI,yBAAW,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAC5D,CAAC,CACF,CAAC;IACJ,CAAC;IA3Be,oBAAM,SA2BrB,CAAA;AACH,CAAC,EAvDgB,aAAa,6BAAb,aAAa,QAuD7B","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Utils\n * utilities that unify operations, especially CRUD operations, on entities\n * for entity-generic operations in the transformer\n */\n\nimport * as assert from \"assert\";\nimport {\n  ConcreteEntityTypes,\n  EntityReference,\n  IModelError,\n} from \"@itwin/core-common\";\nimport {\n  ConcreteEntity,\n  ConcreteEntityProps,\n  // eslint-disable-next-line @typescript-eslint/no-redeclare\n  Element,\n  ElementAspect,\n  EntityReferences,\n  IModelDb,\n  Relationship,\n} from \"@itwin/core-backend\";\nimport { DbResult, Id64 } from \"@itwin/core-bentley\";\n\n/** @internal */\nexport namespace EntityUnifier {\n  export function getReadableType(entity: ConcreteEntity) {\n    if (entity instanceof Element) return \"element\";\n    else if (entity instanceof ElementAspect) return \"element aspect\";\n    else if (entity instanceof Relationship) return \"relationship\";\n    else return \"unknown entity type\";\n  }\n\n  type EntityUpdater = (entityProps: ConcreteEntityProps) => void;\n\n  /** needs to return a widened type otherwise typescript complains when result is used with a narrow type */\n  export function updaterFor(db: IModelDb, entity: ConcreteEntity) {\n    if (entity instanceof Element)\n      return db.elements.updateElement.bind(db.elements) as EntityUpdater;\n    else if (entity instanceof Relationship)\n      return db.relationships.updateInstance.bind(\n        db.relationships\n      ) as EntityUpdater;\n    else if (entity instanceof ElementAspect)\n      return db.elements.updateAspect.bind(db.elements) as EntityUpdater;\n    else\n      assert(\n        false,\n        `unreachable; entity was '${entity.constructor.name}' not an Element, Relationship, or ElementAspect`\n      );\n  }\n\n  export function exists(\n    db: IModelDb,\n    arg: { entity: ConcreteEntity } | { entityReference: EntityReference }\n  ) {\n    const [type, id] =\n      \"entityReference\" in arg\n        ? EntityReferences.split(arg.entityReference)\n        : [undefined, arg.entity.id];\n    const classFullName =\n      \"entityReference\" in arg\n        ? // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-non-null-assertion\n          ConcreteEntityTypes.toBisCoreRootClassFullName(type!)\n        : `[${arg.entity.schemaName}].[${arg.entity.className}]`;\n\n    if (id === undefined || Id64.isInvalid(id)) return false;\n\n    // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated\n    return db.withPreparedStatement(\n      `SELECT 1 FROM ${classFullName} WHERE ECInstanceId=?`,\n      (stmt) => {\n        stmt.bindId(1, id);\n        const matchesResult = stmt.step();\n        if (matchesResult === DbResult.BE_SQLITE_ROW) return true;\n        if (matchesResult === DbResult.BE_SQLITE_DONE) return false;\n        else throw new IModelError(matchesResult, \"query failed\");\n      }\n    );\n  }\n}\n"]}
+{"version":3,"file":"EntityUnifier.js","sourceRoot":"","sources":["../../src/EntityUnifier.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Utils\n * utilities that unify operations, especially CRUD operations, on entities\n * for entity-generic operations in the transformer\n */\n\nimport {\n  ConcreteEntityTypes,\n  EntityReference,\n  QueryBinder,\n} from \"@itwin/core-common\";\nimport {\n  ConcreteEntity,\n  // eslint-disable-next-line @typescript-eslint/no-redeclare\n  Element,\n  ElementAspect,\n  Entity,\n  EntityReferences,\n  IModelDb,\n  Model,\n  Relationship,\n} from \"@itwin/core-backend\";\nimport { Id64, Id64String, OrderedId64Iterable } from \"@itwin/core-bentley\";\n\nconst bisCoreRootClasses: Record<ConcreteEntityTypes, typeof Entity> = {\n  [ConcreteEntityTypes.Model]: Model,\n  [ConcreteEntityTypes.Element]: Element,\n  [ConcreteEntityTypes.ElementAspect]: ElementAspect,\n  [ConcreteEntityTypes.Relationship]: Relationship,\n};\n\n/** @internal */\nexport namespace EntityUnifier {\n  export function getReadableType(entity: ConcreteEntity) {\n    if (entity instanceof Element) return \"element\";\n    else if (entity instanceof ElementAspect) return \"element aspect\";\n    else if (entity instanceof Relationship) return \"relationship\";\n    else return \"unknown entity type\";\n  }\n\n  export async function exists(\n    db: IModelDb,\n    arg: { entity: ConcreteEntity } | { entityReference: EntityReference }\n  ) {\n    let classFullName: string;\n    let id: Id64String;\n    if (\"entityReference\" in arg) {\n      const [type, entityId] = EntityReferences.split(arg.entityReference);\n      classFullName = bisCoreRootClasses[type].classFullName;\n      id = entityId;\n    } else {\n      classFullName = `[${arg.entity.schemaName}].[${arg.entity.className}]`;\n      id = arg.entity.id;\n    }\n\n    if (Id64.isInvalid(id)) return false;\n\n    const query = `SELECT 1 FROM ${classFullName} WHERE ECInstanceId=:id`;\n    const params = new QueryBinder().bindId(\"id\", id);\n    const reader = db.createQueryReader(query, params, {\n      usePrimaryConn: true,\n    });\n    return reader.step();\n  }\n\n  /** Batched existence check: returns the subset of `entityReferences` that exist in `db`,\n   * using one query per concrete entity type instead of one query per reference.\n   */\n  export async function existsAll(\n    db: IModelDb,\n    entityReferences: Iterable<EntityReference>\n  ): Promise<Set<EntityReference>> {\n    const idsByType = new Map<ConcreteEntityTypes, Set<Id64String>>();\n    for (const entityReference of entityReferences) {\n      const [type, id] = EntityReferences.split(entityReference);\n      if (Id64.isInvalid(id)) continue;\n      let ids = idsByType.get(type);\n      if (ids === undefined) {\n        ids = new Set();\n        idsByType.set(type, ids);\n      }\n      ids.add(id);\n    }\n\n    const found = new Set<EntityReference>();\n    for (const [type, ids] of idsByType) {\n      const classFullName = bisCoreRootClasses[type].classFullName;\n      const query = `SELECT ECInstanceId FROM ${classFullName} WHERE InVirtualSet(:ids, ECInstanceId)`;\n      const params = new QueryBinder().bindIdSet(\n        \"ids\",\n        OrderedId64Iterable.sortArray([...ids])\n      );\n      const reader = db.createQueryReader(query, params, {\n        usePrimaryConn: true,\n      });\n      while (await reader.step()) {\n        found.add(EntityReferences.fromEntityType(reader.current[0], type));\n      }\n    }\n    return found;\n  }\n}\n"]}

package/lib/cjs/IModelCloneContext.d.ts

@@ -1,18 +1,24 @@
 import { Id64String } from "@itwin/core-bentley";
 import { ElementAspectProps, ElementProps, EntityReference } from "@itwin/core-common";
 import { Element, ElementAspect, IModelElementCloneContext, IModelJsNative } from "@itwin/core-backend";
+import { EntityExistenceCache } from "./EntityExistenceCache";
+import type { IModelTransformContext } from "./IModelTransformContext";
 /** The context for transforming a *source* Element to a *target* Element and remapping internal identifiers to the target iModel.
- * @beta
+ * @internal
  */
-export declare class IModelCloneContext extends IModelElementCloneContext {
+export declare class IModelCloneContext extends IModelElementCloneContext implements IModelTransformContext {
     private _refTypesCache;
     private _aspectRemapTable;
+    /** A positive-only cache of entity existence checks, scoped to the current transformation run.
+     * @internal
+     */
+    readonly existenceCache: EntityExistenceCache;
     /** perform necessary initialization to use a clone context, namely caching the reference types in the source's schemas */
     initialize(): Promise<void>;
     /** Clone the specified source Element into ElementProps for the target iModel.
      * @internal
      */
-    cloneElement(sourceElement: Element, cloneOptions?: IModelJsNative.CloneElementOptions): ElementProps;
+    cloneElement(sourceElement: Element, cloneOptions?: IModelJsNative.CloneElementOptions): Promise<ElementProps>;
     /** Add a rule that remaps the specified source ElementAspect to the specified target ElementAspect. */
     remapElementAspect(aspectSourceId: Id64String, aspectTargetId: Id64String): void;
     /** Remove a rule that remaps the specified source ElementAspect */
@@ -24,10 +30,10 @@ export declare class IModelCloneContext extends IModelElementCloneContext {
     /** Look up a target [EntityReference]($bentley) from a source [EntityReference]($bentley)
      * @returns the target CodeSpecId or a [EntityReference]($bentley) containing [Id64.invalid]($bentley) if a mapping is not found.
      */
-    findTargetEntityId(sourceEntityId: EntityReference): EntityReference;
+    findTargetEntityId(sourceEntityId: EntityReference): Promise<EntityReference>;
     /** Clone the specified source Element into ElementProps for the target iModel.
      * @internal
      */
-    cloneElementAspect(sourceElementAspect: ElementAspect): ElementAspectProps;
+    cloneElementAspect(sourceElementAspect: ElementAspect): Promise<ElementAspectProps>;
 }
 //# sourceMappingURL=IModelCloneContext.d.ts.map

package/lib/cjs/IModelCloneContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IModelCloneContext.d.ts","sourceRoot":"","sources":["../../src/IModelCloneContext.ts"],"names":[],"mappings":"AAQA,OAAO,EAAkB,UAAU,EAAU,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAIL,kBAAkB,EAClB,YAAY,EACZ,eAAe,EAOhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,OAAO,EACP,aAAa,EAEb,yBAAyB,EACzB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAO7B;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,yBAAyB;IAC/D,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,iBAAiB,CAAqC;IAE9D,0HAA0H;IACpG,UAAU;IAIhC;;OAEG;IACa,YAAY,CAC1B,aAAa,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,cAAc,CAAC,mBAAmB,GAChD,YAAY;IA+Cf,uGAAuG;IAChG,kBAAkB,CACvB,cAAc,EAAE,UAAU,EAC1B,cAAc,EAAE,UAAU,GACzB,IAAI;IAIP,mEAAmE;IAC5D,mBAAmB,CAAC,cAAc,EAAE,UAAU,GAAG,IAAI;IAI5D;;OAEG;IACI,kBAAkB,CAAC,cAAc,EAAE,UAAU,GAAG,UAAU;IAIjE;;OAEG;IACI,kBAAkB,CAAC,cAAc,EAAE,eAAe,GAAG,eAAe;IAkI3E;;OAEG;IACI,kBAAkB,CACvB,mBAAmB,EAAE,aAAa,GACjC,kBAAkB;CAsCtB"}
+{"version":3,"file":"IModelCloneContext.d.ts","sourceRoot":"","sources":["../../src/IModelCloneContext.ts"],"names":[],"mappings":"AAQA,OAAO,EAAQ,UAAU,EAAU,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAKL,kBAAkB,EAClB,YAAY,EACZ,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,OAAO,EACP,aAAa,EAEb,yBAAyB,EACzB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAIvE;;GAEG;AACH,qBAAa,kBACX,SAAQ,yBACR,YAAW,sBAAsB;IAEjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,iBAAiB,CAA4B;IAErD;;OAEG;IACH,SAAgB,cAAc,uBAA8B;IAE5D,0HAA0H;IACpG,UAAU,kBAE/B;IAED;;OAEG;IACmB,YAAY,CAChC,aAAa,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,cAAc,CAAC,mBAAmB,GAChD,OAAO,CAAC,YAAY,CAAC,CAgFvB;IAED,uGAAuG;IAChG,kBAAkB,CACvB,cAAc,EAAE,UAAU,EAC1B,cAAc,EAAE,UAAU,GACzB,IAAI,CAEN;IAED,mEAAmE;IAC5D,mBAAmB,CAAC,cAAc,EAAE,UAAU,GAAG,IAAI,CAE3D;IAED;;OAEG;IACI,kBAAkB,CAAC,cAAc,EAAE,UAAU,GAAG,UAAU,CAEhE;IAED;;OAEG;IACU,kBAAkB,CAC7B,cAAc,EAAE,eAAe,GAC9B,OAAO,CAAC,eAAe,CAAC,CA+H1B;IAED;;OAEG;IACU,kBAAkB,CAC7B,mBAAmB,EAAE,aAAa,GACjC,OAAO,CAAC,kBAAkB,CAAC,CAqD7B;CACF"}

package/lib/cjs/IModelCloneContext.js

@@ -8,20 +8,26 @@ exports.IModelCloneContext = void 0;
 /** @packageDocumentation
  * @module iModels
  */
-const assert = require("assert");
+const node_assert_1 = require("node:assert");
 const core_bentley_1 = require("@itwin/core-bentley");
 const core_common_1 = require("@itwin/core-common");
 const core_backend_1 = require("@itwin/core-backend");
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const ECReferenceTypesCache_1 = require("./ECReferenceTypesCache");
-const EntityUnifier_1 = require("./EntityUnifier");
+const EntityExistenceCache_1 = require("./EntityExistenceCache");
 const TransformerLoggerCategory_1 = require("./TransformerLoggerCategory");
+const BigMap_1 = require("./BigMap");
 const loggerCategory = TransformerLoggerCategory_1.TransformerLoggerCategory.IModelCloneContext;
 /** The context for transforming a *source* Element to a *target* Element and remapping internal identifiers to the target iModel.
- * @beta
+ * @internal
  */
 class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
     _refTypesCache = new ECReferenceTypesCache_1.ECReferenceTypesCache();
-    _aspectRemapTable = new Map();
+    _aspectRemapTable = new BigMap_1.BigMap();
+    /** A positive-only cache of entity existence checks, scoped to the current transformation run.
+     * @internal
+     */
+    existenceCache = new EntityExistenceCache_1.EntityExistenceCache();
     /** perform necessary initialization to use a clone context, namely caching the reference types in the source's schemas */
     async initialize() {
         await this._refTypesCache.initAllSchemasInIModel(this.sourceDb);
@@ -29,15 +35,39 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
     /** Clone the specified source Element into ElementProps for the target iModel.
      * @internal
      */
-    cloneElement(sourceElement, cloneOptions) {
+    async cloneElement(sourceElement, cloneOptions) {
         const targetElementProps = this["_nativeContext"].cloneElement(sourceElement.id, cloneOptions);
+        // Native same-iModel cloning clears codes for inserts, but identity mappings are updates.
+        if (!this.isBetweenIModels &&
+            this.findTargetElementId(sourceElement.id) === sourceElement.id) {
+            targetElementProps.code.value = sourceElement.code.value;
+            if (!core_bentley_1.Id64.isValidId64(targetElementProps.code.spec)) {
+                const mappedCodeSpecId = this.findTargetCodeSpecId(sourceElement.code.spec);
+                targetElementProps.code.spec = core_bentley_1.Id64.isValidId64(mappedCodeSpecId)
+                    ? mappedCodeSpecId
+                    : sourceElement.code.spec;
+            }
+            if (!core_bentley_1.Id64.isValidId64(targetElementProps.code.scope)) {
+                const mappedCodeScopeId = this.findTargetElementId(sourceElement.code.scope);
+                targetElementProps.code.scope = core_bentley_1.Id64.isValidId64(mappedCodeScopeId)
+                    ? mappedCodeScopeId
+                    : sourceElement.code.scope;
+            }
+        }
         // Ensure that all NavigationProperties in targetElementProps have a defined value so "clearing" changes will be part of the JSON used for update
-        sourceElement.forEachProperty((propertyName, meta) => {
-            if (meta.isNavigation &&
-                undefined === sourceElement[propertyName]) {
-                targetElementProps[propertyName] = core_common_1.RelatedElement.none;
+        const sourceElementClass = sourceElement.iModel.schemaContext.getSchemaItemSync(sourceElement.schemaItemKey, ecschema_metadata_1.EntityClass);
+        (0, node_assert_1.strict)(sourceElementClass !== undefined, `Cannot get metadata for ${sourceElement.classFullName}.`);
+        for (const property of sourceElementClass.getPropertiesSync()) {
+            // Exclude custom properties because C++ has already handled them.
+            if (property.customAttributes?.has("BisCore.CustomHandledProperty"))
+                continue;
+            const name = property.name;
+            if (property.isNavigation() &&
+                undefined === sourceElement[core_common_1.ECJsNames.toJsName(name)]) {
+                targetElementProps[core_common_1.ECJsNames.toJsName(name)] =
+                    core_common_1.RelatedElement.none;
             }
-        }, false); // exclude custom because C++ has already handled them
+        }
         if (this.isBetweenIModels) {
             // The native C++ cloneElement strips off federationGuid, want to put it back if transformation is between iModels
             targetElementProps.federationGuid = sourceElement.federationGuid;
@@ -54,7 +84,7 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
             targetElementProps.code = core_common_1.Code.createEmpty();
         }
         const jsClass = this.sourceDb.getJsClass(sourceElement.classFullName);
-        jsClass["onCloned"](this, sourceElement.toJSON(), targetElementProps);
+        await jsClass["onCloned"](this, sourceElement.toJSON(), targetElementProps);
         return targetElementProps;
     }
     /** Add a rule that remaps the specified source ElementAspect to the specified target ElementAspect. */
@@ -74,7 +104,7 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
     /** Look up a target [EntityReference]($bentley) from a source [EntityReference]($bentley)
      * @returns the target CodeSpecId or a [EntityReference]($bentley) containing [Id64.invalid]($bentley) if a mapping is not found.
      */
-    findTargetEntityId(sourceEntityId) {
+    async findTargetEntityId(sourceEntityId) {
         const [type, rawId] = core_backend_1.EntityReferences.split(sourceEntityId);
         if (core_bentley_1.Id64.isValid(rawId)) {
             switch (type) {
@@ -97,7 +127,7 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
                     }
                     // Check if the model exists, `findTargetElementId` may have worked because the element exists when the model doesn't.
                     // That can occur in the transformer since a submodeled element is imported before its submodel.
-                    if (EntityUnifier_1.EntityUnifier.exists(this.targetDb, { entityReference: targetId }))
+                    if (await this.existenceCache.exists(this.targetDb, targetId))
                         return targetId;
                     break;
                 }
@@ -121,8 +151,7 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
               ELSE 'error'
             END
           `;
-                    // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-                    const relInSource = this.sourceDb.withPreparedStatement(`
+                    const sql = `
             SELECT
               SourceECInstanceId,
               TargetECInstanceId,
@@ -130,14 +159,17 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
               (${makeGetConcreteEntityTypeSql("TargetECClassId")}) AS TargetType
             FROM BisCore:ElementRefersToElements
             WHERE ECInstanceId=?
-            `, (stmt) => {
-                        stmt.bindId(1, rawId);
-                        let status;
-                        while ((status = stmt.step()) === core_bentley_1.DbResult.BE_SQLITE_ROW) {
-                            const sourceId = stmt.getValue(0).getId();
-                            const targetId = stmt.getValue(1).getId();
-                            const sourceType = stmt.getValue(2).getString();
-                            const targetType = stmt.getValue(3).getString();
+            `;
+                    const params = new core_common_1.QueryBinder().bindId(1, rawId);
+                    const reader = this.sourceDb.createQueryReader(sql, params, {
+                        usePrimaryConn: true,
+                    });
+                    const relInSource = await (async () => {
+                        if (await reader.step()) {
+                            const sourceId = reader.current[0];
+                            const targetId = reader.current[1];
+                            const sourceType = reader.current[2];
+                            const targetType = reader.current[3];
                             if (sourceType === "error" || targetType === "error")
                                 throw Error("relationship end had unknown root class");
                             return {
@@ -145,10 +177,8 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
                                 targetId: `${targetType}${targetId}`,
                             };
                         }
-                        if (status !== core_bentley_1.DbResult.BE_SQLITE_DONE)
-                            throw new core_common_1.IModelError(status, "unexpected query failure");
                         return undefined;
-                    });
+                    })();
                     if (relInSource === undefined)
                         break;
                     // just in case prevent recursion
@@ -156,29 +186,30 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
                         relInSource.targetId === sourceEntityId)
                         throw Error("link table relationship end was resolved to itself. This should be impossible");
                     const relInTarget = {
-                        sourceId: this.findTargetEntityId(relInSource.sourceId),
-                        targetId: this.findTargetEntityId(relInSource.targetId),
+                        sourceId: await this.findTargetEntityId(relInSource.sourceId),
+                        targetId: await this.findTargetEntityId(relInSource.targetId),
                     };
                     // return a null
                     if (!core_backend_1.EntityReferences.isValid(relInTarget.sourceId) ||
                         !core_backend_1.EntityReferences.isValid(relInTarget.targetId))
                         break;
-                    // eslint-disable-next-line @itwin/no-internal, @typescript-eslint/no-deprecated
-                    const relInTargetId = this.targetDb.withPreparedStatement(`
+                    const relInTargetSql = `
             SELECT ECInstanceId
             FROM BisCore:ElementRefersToElements
             WHERE SourceECInstanceId=?
               AND TargetECInstanceId=?
-            `, (stmt) => {
-                        stmt.bindId(1, core_backend_1.EntityReferences.toId64(relInTarget.sourceId));
-                        stmt.bindId(2, core_backend_1.EntityReferences.toId64(relInTarget.targetId));
-                        const status = stmt.step();
-                        if (status === core_bentley_1.DbResult.BE_SQLITE_ROW)
-                            return stmt.getValue(0).getId();
-                        if (status !== core_bentley_1.DbResult.BE_SQLITE_DONE)
-                            throw new core_common_1.IModelError(status, "unexpected query failure");
-                        return core_bentley_1.Id64.invalid;
-                    });
+            `;
+                    const relInTargetParams = new core_common_1.QueryBinder();
+                    relInTargetParams.bindId(1, core_backend_1.EntityReferences.toId64(relInTarget.sourceId));
+                    relInTargetParams.bindId(2, core_backend_1.EntityReferences.toId64(relInTarget.targetId));
+                    const relInTargetResult = await this.targetDb
+                        .createQueryReader(relInTargetSql, relInTargetParams, {
+                        usePrimaryConn: true,
+                    })
+                        .next();
+                    const relInTargetId = relInTargetResult.done
+                        ? core_bentley_1.Id64.invalid
+                        : relInTargetResult.value.id;
                     return `r${relInTargetId}`;
                 }
             }
@@ -188,30 +219,35 @@ class IModelCloneContext extends core_backend_1.IModelElementCloneContext {
     /** Clone the specified source Element into ElementProps for the target iModel.
      * @internal
      */
-    cloneElementAspect(sourceElementAspect) {
+    async cloneElementAspect(sourceElementAspect) {
         const targetElementAspectProps = sourceElementAspect.toJSON();
         targetElementAspectProps.id = undefined;
-        sourceElementAspect.forEachProperty((propertyName, propertyMetaData) => {
-            if (propertyMetaData.isNavigation) {
-                const sourceNavProp = sourceElementAspect.asAny[propertyName];
+        const targetEntityIds = [];
+        const sourceElementAspectClass = sourceElementAspect.iModel.schemaContext.getSchemaItemSync(sourceElementAspect.schemaItemKey, ecschema_metadata_1.EntityClass);
+        (0, node_assert_1.strict)(sourceElementAspectClass !== undefined, `Cannot get metadata for ${sourceElementAspect.classFullName}.`);
+        for (const property of sourceElementAspectClass.getPropertiesSync()) {
+            const ecName = property.name;
+            const name = core_common_1.ECJsNames.toJsName(ecName);
+            if (property.isNavigation()) {
+                const sourceNavProp = sourceElementAspect.asAny[name];
                 if (sourceNavProp?.id) {
-                    const navPropRefType = this._refTypesCache.getNavPropRefType(sourceElementAspect.schemaName, sourceElementAspect.className, propertyName);
-                    assert(navPropRefType !== undefined, `nav prop ref type for '${propertyName}' was not in the cache, this is a bug.`);
-                    const targetEntityReference = this.findTargetEntityId(core_backend_1.EntityReferences.fromEntityType(sourceNavProp.id, navPropRefType));
-                    const targetEntityId = core_backend_1.EntityReferences.toId64(targetEntityReference);
-                    // spread the property in case toJSON did not deep-clone
-                    targetElementAspectProps[propertyName] = {
-                        ...targetElementAspectProps[propertyName],
-                        id: targetEntityId,
-                    };
+                    const navPropRefType = this._refTypesCache.getNavPropRefType(sourceElementAspect.schemaName, sourceElementAspect.className, name);
+                    (0, node_assert_1.strict)(navPropRefType !== undefined, `nav prop ref type for '${name}' was not in the cache, this is a bug.`);
+                    targetEntityIds.push(this.findTargetEntityId(core_backend_1.EntityReferences.fromEntityType(sourceNavProp.id, navPropRefType)).then((targetEntityReference) => {
+                        const targetEntityId = core_backend_1.EntityReferences.toId64(targetEntityReference);
+                        // spread the property in case toJSON did not deep-clone
+                        targetElementAspectProps[name] = {
+                            ...targetElementAspectProps[name],
+                            id: targetEntityId,
+                        };
+                    }));
                 }
             }
-            else if (core_common_1.PrimitiveTypeCode.Long === propertyMetaData.primitiveType &&
-                "Id" === propertyMetaData.extendedType) {
-                targetElementAspectProps[propertyName] =
-                    this.findTargetElementId(sourceElementAspect.asAny[propertyName]);
+            else if (property.isPrimitive() && "Id" === property.extendedTypeName) {
+                targetElementAspectProps[name] = this.findTargetElementId(sourceElementAspect.asAny[name]);
             }
-        });
+        }
+        await Promise.all(targetEntityIds);
         return targetElementAspectProps;
     }
 }