@itwin/ecschema-rpcinterface-tests 4.0.0-dev.99 → 4.0.0

package/lib/dist/bundled-tests.js

@@ -59083,40 +59083,82 @@ exports.ECStringConstants = ECStringConstants;
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SchemaContext = exports.SchemaCache = exports.SchemaMap = void 0;
+exports.SchemaContext = exports.SchemaCache = void 0;
 const ECObjects_1 = __webpack_require__(/*! ./ECObjects */ "../../core/ecschema-metadata/lib/cjs/ECObjects.js");
 const Exception_1 = __webpack_require__(/*! ./Exception */ "../../core/ecschema-metadata/lib/cjs/Exception.js");
 /**
- * @beta
+ * @internal
  */
 class SchemaMap extends Array {
 }
-exports.SchemaMap = SchemaMap;
 /**
- * @beta
+ * @internal
  */
 class SchemaCache {
     constructor() {
         this._schema = new SchemaMap();
     }
     get count() { return this._schema.length; }
+    loadedSchemaExists(schemaKey) {
+        return undefined !== this._schema.find((entry) => entry.schemaInfo.schemaKey.matches(schemaKey, ECObjects_1.SchemaMatchType.Latest) && !entry.schemaPromise);
+    }
+    schemaPromiseExists(schemaKey) {
+        return undefined !== this._schema.find((entry) => entry.schemaInfo.schemaKey.matches(schemaKey, ECObjects_1.SchemaMatchType.Latest) && undefined !== entry.schemaPromise);
+    }
+    findEntry(schemaKey, matchType) {
+        return this._schema.find((entry) => entry.schemaInfo.schemaKey.matches(schemaKey, matchType));
+    }
+    removeSchemaPromise(schemaKey) {
+        const entry = this.findEntry(schemaKey, ECObjects_1.SchemaMatchType.Latest);
+        if (entry)
+            entry.schemaPromise = undefined;
+    }
+    removeEntry(schemaKey) {
+        this._schema = this._schema.filter((entry) => !entry.schemaInfo.schemaKey.matches(schemaKey));
+    }
+    /**
+     * Returns true if the schema exists in either the schema cache or the promise cache.  SchemaMatchType.Latest used.
+     * @param schemaKey The key to search for.
+     */
+    schemaExists(schemaKey) {
+        return this.loadedSchemaExists(schemaKey) || this.schemaPromiseExists(schemaKey);
+    }
+    /**
+     * Adds a promise to load the schema to the cache. Does not allow for duplicate schemas in the cache of schemas or cache of promises, checks using SchemaMatchType.Latest.
+     * When the promise completes the schema will be added to the schema cache and the promise will be removed from the promise cache
+     * @param schemaInfo An object with the schema key for the schema being loaded and it's references
+     * @param schema The partially loaded schema that the promise will fulfill
+     * @param schemaPromise The schema promise to add to the cache.
+     */
+    async addSchemaPromise(schemaInfo, schema, schemaPromise) {
+        if (this.schemaExists(schemaInfo.schemaKey))
+            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.DuplicateSchema, `The schema, ${schemaPromise.toString()}, already exists within this cache.`);
+        this._schema.push({ schemaInfo, schema, schemaPromise });
+        // This promise is cached and will be awaited when the user requests the full schema.
+        // If the promise competes successfully before the user requests the schema it will be removed from the cache
+        // If it fails it will remain in the cache until the user awaits it and handles the error
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        schemaPromise.then(() => {
+            this.removeSchemaPromise(schemaInfo.schemaKey);
+        });
+    }
     /**
      * Adds a schema to the cache. Does not allow for duplicate schemas, checks using SchemaMatchType.Latest.
      * @param schema The schema to add to the cache.
      */
     async addSchema(schema) {
-        if (await this.getSchema(schema.schemaKey))
+        if (this.schemaExists(schema.schemaKey))
             throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.DuplicateSchema, `The schema, ${schema.schemaKey.toString()}, already exists within this cache.`);
-        this._schema.push(schema);
+        this._schema.push({ schemaInfo: schema, schema });
     }
     /**
      * Adds a schema to the cache. Does not allow for duplicate schemas, checks using SchemaMatchType.Latest.
      * @param schema The schema to add to the cache.
      */
     addSchemaSync(schema) {
-        if (this.getSchemaSync(schema.schemaKey))
+        if (this.schemaExists(schema.schemaKey))
             throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.DuplicateSchema, `The schema, ${schema.schemaKey.toString()}, already exists within this cache.`);
-        this._schema.push(schema);
+        this._schema.push({ schemaInfo: schema, schema });
     }
     /**
      * Gets the schema which matches the provided SchemaKey.
@@ -59126,46 +59168,69 @@ class SchemaCache {
     async getSchema(schemaKey, matchType = ECObjects_1.SchemaMatchType.Latest) {
         if (this.count === 0)
             return undefined;
-        const findFunc = (schema) => {
-            return schema.schemaKey.matches(schemaKey, matchType);
-        };
-        const foundSchema = this._schema.find(findFunc);
-        if (!foundSchema)
+        const entry = this.findEntry(schemaKey, matchType);
+        if (!entry)
             return undefined;
-        return foundSchema;
+        if (entry.schemaPromise) {
+            try {
+                const schema = await entry.schemaPromise;
+                return schema;
+            }
+            catch (e) {
+                this.removeEntry(schemaKey);
+                throw e;
+            }
+        }
+        return entry.schema;
     }
     /**
-     *
-     * @param schemaKey
-     * @param matchType
+      * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
+      * @param schemaKey The SchemaKey describing the schema to get from the cache.
+      * @param matchType The match type to use when locating the schema
+      */
+    async getSchemaInfo(schemaKey, matchType = ECObjects_1.SchemaMatchType.Latest) {
+        if (this.count === 0)
+            return undefined;
+        const entry = this.findEntry(schemaKey, matchType);
+        if (entry)
+            return entry.schemaInfo;
+        return undefined;
+    }
+    /**
+     * Gets the schema which matches the provided SchemaKey.  If the schema is partially loaded an exception will be thrown.
+     * @param schemaKey The SchemaKey describing the schema to get from the cache.
+     * @param matchType The match type to use when locating the schema
      */
     getSchemaSync(schemaKey, matchType = ECObjects_1.SchemaMatchType.Latest) {
         if (this.count === 0)
             return undefined;
-        const findFunc = (schema) => {
-            return schema.schemaKey.matches(schemaKey, matchType);
-        };
-        const foundSchema = this._schema.find(findFunc);
-        if (!foundSchema)
-            return foundSchema;
-        return foundSchema;
+        const entry = this.findEntry(schemaKey, matchType);
+        if (entry) {
+            if (entry.schemaPromise) {
+                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLoadSchema, `The Schema ${schemaKey.toString()} is partially loaded so cannot be loaded synchronously.`);
+            }
+            return entry.schema;
+        }
+        return undefined;
     }
     /**
-     * Generator function that can iterate through each schema in _schema SchemaMap and items for each Schema
+     * Generator function that can iterate through each schema in _schema SchemaMap and items for each Schema.
+     * Does not include schema items from schemas that are not completely loaded yet.
      */
     *getSchemaItems() {
-        for (const schema of this._schema) {
-            for (const schemaItem of schema.getItems()) {
+        for (const entry of this._schema) {
+            for (const schemaItem of entry.schema.getItems()) {
                 yield schemaItem;
             }
         }
     }
     /**
      * Gets all the schemas from the schema cache.
+     * Does not include schemas from schemas that are not completely loaded yet.
      * @returns An array of Schema objects.
      */
     getAllSchemas() {
-        return this._schema;
+        return this._schema.map((entry) => entry.schema);
     }
 }
 exports.SchemaCache = SchemaCache;
@@ -59187,7 +59252,7 @@ class SchemaContext {
         this._locaters.push(locater);
     }
     /**
-     * Adds the schema to this context
+     * Adds the schema to this context.  Use addSchemaPromise instead when asynchronously loading schemas.
      * @param schema The schema to add to this context
      */
     async addSchema(schema) {
@@ -59203,6 +59268,7 @@ class SchemaContext {
     /**
      * Adds the given SchemaItem to the the SchemaContext by locating the schema, with the best match of SchemaMatchType.Exact, and
      * @param schemaItem The SchemaItem to add
+     * @deprecated in 4.0 use ecschema-editing package
      */
     async addSchemaItem(schemaItem) {
         const schema = await this.getSchema(schemaItem.key.schemaKey, ECObjects_1.SchemaMatchType.Exact);
@@ -59210,6 +59276,24 @@ class SchemaContext {
             throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLocateSchema, `Unable to add the schema item ${schemaItem.name} to the schema ${schemaItem.key.schemaKey.toString()} because the schema could not be located.`);
         schema.addItem(schemaItem);
     }
+    /**
+     * Returns true if the schema is already in the context.  SchemaMatchType.Latest is used to find a match.
+     * @param schemaKey
+     */
+    schemaExists(schemaKey) {
+        return this._knownSchemas.schemaExists(schemaKey);
+    }
+    /**
+     * Adds a promise to load the schema to the cache. Does not allow for duplicate schemas in the cache of schemas or cache of promises, checks using SchemaMatchType.Latest.
+     * When the promise completes the schema will be added to the schema cache and the promise will be removed from the promise cache.
+     * Use this method over addSchema when asynchronously loading schemas
+     * @param schemaInfo An object with the schema key for the schema being loaded and it's references
+     * @param schema The partially loaded schema that the promise will fulfill
+     * @param schemaPromise The schema promise to add to the cache.
+     */
+    async addSchemaPromise(schemaInfo, schema, schemaPromise) {
+        return this._knownSchemas.addSchemaPromise(schemaInfo, schema, schemaPromise);
+    }
     /**
      *
      * @param schemaKey
@@ -59223,6 +59307,20 @@ class SchemaContext {
         }
         return undefined;
     }
+    /**
+     * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
+     * The fully loaded schema can be gotten later from the context using the getCachedSchema method.
+     * @param schemaKey The SchemaKey describing the schema to get from the cache.
+     * @param matchType The match type to use when locating the schema
+     */
+    async getSchemaInfo(schemaKey, matchType) {
+        for (const locater of this._locaters) {
+            const schemaInfo = await locater.getSchemaInfo(schemaKey, matchType, this);
+            if (undefined !== schemaInfo)
+                return schemaInfo;
+        }
+        return undefined;
+    }
     /**
      *
      * @param schemaKey
@@ -59238,42 +59336,62 @@ class SchemaContext {
     }
     /**
      * Attempts to get a Schema from the context's cache.
+     * Will await a partially loaded schema then return when it is completely loaded.
      * @param schemaKey The SchemaKey to identify the Schema.
      * @param matchType The SchemaMatch type to use. Default is SchemaMatchType.Latest.
      * @internal
      */
     async getCachedSchema(schemaKey, matchType = ECObjects_1.SchemaMatchType.Latest) {
-        return this.getCachedSchemaSync(schemaKey, matchType);
+        return this._knownSchemas.getSchema(schemaKey, matchType);
     }
     /**
      * Attempts to get a Schema from the context's cache.
+     * Will return undefined if the cached schema is partially loaded.  Use the async method to await partially loaded schemas.
      * @param schemaKey The SchemaKey to identify the Schema.
      * @param matchType The SchemaMatch type to use. Default is SchemaMatchType.Latest.
      * @internal
      */
     getCachedSchemaSync(schemaKey, matchType = ECObjects_1.SchemaMatchType.Latest) {
-        const schema = this._knownSchemas.getSchemaSync(schemaKey, matchType);
-        return schema;
+        return this._knownSchemas.getSchemaSync(schemaKey, matchType);
     }
+    /**
+     * Gets the schema item from the specified schema if it exists in this [[SchemaContext]].
+     * Will await a partially loaded schema then look in it for the requested item
+     * @param schemaItemKey The SchemaItemKey identifying the item to return.  SchemaMatchType.Latest is used to match the schema.
+     * @returns The requested schema item
+     */
     async getSchemaItem(schemaItemKey) {
         const schema = await this.getSchema(schemaItemKey.schemaKey, ECObjects_1.SchemaMatchType.Latest);
         if (undefined === schema)
             return undefined;
         return schema.getItem(schemaItemKey.name);
     }
+    /**
+     * Gets the schema item from the specified schema if it exists in this [[SchemaContext]].
+     * Will skip a partially loaded schema and return undefined if the item belongs to that schema.  Use the async method to await partially loaded schemas.
+     * @param schemaItemKey The SchemaItemKey identifying the item to return.  SchemaMatchType.Latest is used to match the schema.
+     * @returns The requested schema item
+     */
     getSchemaItemSync(schemaItemKey) {
         const schema = this.getSchemaSync(schemaItemKey.schemaKey, ECObjects_1.SchemaMatchType.Latest);
         if (undefined === schema)
             return undefined;
         return schema.getItemSync(schemaItemKey.name);
     }
+    /**
+     * Iterates through the items of each schema known to the context.  This includes schemas added to the
+     * context using [[SchemaContext.addSchema]]. This does not include schemas that
+     * can be located by an ISchemaLocater instance added to the context.
+     * Does not include schema items from schemas that are not completely loaded yet.
+     */
     getSchemaItems() {
         return this._knownSchemas.getSchemaItems();
     }
     /**
      * Gets all the Schemas known by the context. This includes schemas added to the
      * context using [[SchemaContext.addSchema]]. This does not include schemas that
-     * can be located by an ISchemaLocater instance added to the context.
+     * can be located by an ISchemaLocater instance added to the context.  Does not
+     * include schemas that are partially loaded.
      * @returns An array of Schema objects.
      */
     getKnownSchemas() {
@@ -59443,11 +59561,13 @@ class SchemaReadHelper {
         this._parserType = parserType;
     }
     /**
-     * Populates the given Schema from a serialized representation.
+     * Creates a complete SchemaInfo and starts parsing the schema from a serialized representation.
+     * The info and schema promise will be registered with the SchemaContext.  The complete schema can be retrieved by
+     * calling getCachedSchema on the context.
      * @param schema The Schema to populate
      * @param rawSchema The serialized data to use to populate the Schema.
      */
-    async readSchema(schema, rawSchema) {
+    async readSchemaInfo(schema, rawSchema) {
         // Ensure context matches schema context
         if (schema.context) {
             if (this._context !== schema.context)
@@ -59460,12 +59580,38 @@ class SchemaReadHelper {
         // Loads all of the properties on the Schema object
         await schema.fromJSON(this._parser.parseSchema());
         this._schema = schema;
-        // Need to add this schema to the context to be able to locate schemaItems within the context.
-        await this._context.addSchema(schema);
-        // Load schema references first
-        // Need to figure out if other schemas are present.
+        const schemaInfo = { schemaKey: schema.schemaKey, references: [] };
         for (const reference of this._parser.getReferences()) {
-            await this.loadSchemaReference(reference);
+            const refKey = new SchemaKey_1.SchemaKey(reference.name, SchemaKey_1.ECVersion.fromString(reference.version));
+            schemaInfo.references.push({ schemaKey: refKey });
+        }
+        this._schemaInfo = schemaInfo;
+        // Need to add this schema to the context to be able to locate schemaItems within the context.
+        if (!this._context.schemaExists(schema.schemaKey)) {
+            await this._context.addSchemaPromise(schemaInfo, schema, this.loadSchema(schemaInfo, schema));
+        }
+        return schemaInfo;
+    }
+    /**
+     * Populates the given Schema from a serialized representation.
+     * @param schema The Schema to populate
+     * @param rawSchema The serialized data to use to populate the Schema.
+     */
+    async readSchema(schema, rawSchema) {
+        if (!this._schemaInfo) {
+            await this.readSchemaInfo(schema, rawSchema);
+        }
+        const cachedSchema = await this._context.getCachedSchema(this._schemaInfo.schemaKey, ECObjects_1.SchemaMatchType.Latest);
+        if (undefined === cachedSchema)
+            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLoadSchema, `Could not load schema ${schema.schemaKey.toString()}`);
+        return cachedSchema;
+    }
+    /* Finish loading the rest of the schema */
+    async loadSchema(schemaInfo, schema) {
+        // Verify that there are no schema reference cycles, this will start schema loading by loading their headers
+        (await SchemaGraph_1.SchemaGraph.generateGraph(schemaInfo, this._context)).throwIfCycles();
+        for (const reference of schemaInfo.references) {
+            await this.loadSchemaReference(schemaInfo, reference.schemaKey);
         }
         if (this._visitorHelper)
             await this._visitorHelper.visitSchema(schema, false);
@@ -59524,11 +59670,10 @@ class SchemaReadHelper {
      * Ensures that the schema references can be located and adds them to the schema.
      * @param ref The object to read the SchemaReference's props from.
      */
-    async loadSchemaReference(ref) {
-        const schemaKey = new SchemaKey_1.SchemaKey(ref.name, SchemaKey_1.ECVersion.fromString(ref.version));
-        const refSchema = await this._context.getSchema(schemaKey, ECObjects_1.SchemaMatchType.LatestWriteCompatible);
+    async loadSchemaReference(schemaInfo, refKey) {
+        const refSchema = await this._context.getSchema(refKey, ECObjects_1.SchemaMatchType.LatestWriteCompatible);
         if (undefined === refSchema)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLocateSchema, `Could not locate the referenced schema, ${ref.name}.${ref.version}, of ${this._schema.schemaKey.name}`);
+            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLocateSchema, `Could not locate the referenced schema, ${refKey.name}.${refKey.version.toString()}, of ${schemaInfo.schemaKey.name}`);
         await this._schema.addReference(refSchema);
         const results = this.validateSchemaReferences(this._schema);
         let errorMessage = "";
@@ -59549,6 +59694,7 @@ class SchemaReadHelper {
         if (!refSchema)
             throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLocateSchema, `Could not locate the referenced schema, ${ref.name}.${ref.version}, of ${this._schema.schemaKey.name}`);
         this._schema.addReferenceSync(refSchema);
+        SchemaGraph_1.SchemaGraph.generateGraphSync(this._schema).throwIfCycles();
         const results = this.validateSchemaReferences(this._schema);
         let errorMessage = "";
         for (const result of results) {
@@ -59577,12 +59723,6 @@ class SchemaReadHelper {
                 aliases.set(schemaRef.alias, schemaRef);
             }
         }
-        const graph = new SchemaGraph_1.SchemaGraph(schema);
-        const cycles = graph.detectCycles();
-        if (cycles) {
-            const result = cycles.map((cycle) => `${cycle.schema.name} --> ${cycle.refSchema.name}`).join(", ");
-            yield `Schema '${schema.name}' has reference cycles: ${result}`;
-        }
     }
     /**
      * Given the schema item object, the anticipated type and the name a schema item is created and loaded into the schema provided.
@@ -59767,7 +59907,10 @@ class SchemaReadHelper {
         const isInThisSchema = (this._schema && this._schema.name.toLowerCase() === schemaName.toLowerCase());
         if (undefined === schemaName || 0 === schemaName.length)
             throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidECJson, `The SchemaItem ${name} is invalid without a schema name`);
-        if (isInThisSchema && undefined === await this._schema.getItem(itemName)) {
+        if (isInThisSchema) {
+            schemaItem = await this._schema.getItem(itemName);
+            if (schemaItem)
+                return schemaItem;
             const foundItem = this._parser.findItem(itemName);
             if (foundItem) {
                 schemaItem = await this.loadSchemaItem(this._schema, ...foundItem);
@@ -62841,6 +62984,7 @@ var ECObjectsStatus;
     ECObjectsStatus[ECObjectsStatus["InvalidSchemaComparisonArgument"] = 35077] = "InvalidSchemaComparisonArgument";
     ECObjectsStatus[ECObjectsStatus["InvalidSchemaAlias"] = 35078] = "InvalidSchemaAlias";
     ECObjectsStatus[ECObjectsStatus["InvalidSchemaKey"] = 35079] = "InvalidSchemaKey";
+    ECObjectsStatus[ECObjectsStatus["UnableToLoadSchema"] = 35080] = "UnableToLoadSchema";
 })(ECObjectsStatus = exports.ECObjectsStatus || (exports.ECObjectsStatus = {}));
 /** @internal */
 class ECObjectsError extends core_bentley_1.BentleyError {
@@ -66466,6 +66610,9 @@ class Schema {
         schemaXml.appendChild(schemaMetadata);
         return schemaXml;
     }
+    /**
+     * Loads the schema header (name, version alias, label and description) from the input SchemaProps
+     */
     fromJSONSync(schemaProps) {
         if (undefined === this._schemaKey) {
             const schemaName = schemaProps.name;
@@ -66491,9 +66638,22 @@ class Schema {
         if (undefined !== schemaProps.description)
             this._description = schemaProps.description;
     }
+    /**
+     * Loads the schema header (name, version alias, label and description) from the input SchemaProps
+     */
     async fromJSON(schemaProps) {
         this.fromJSONSync(schemaProps);
     }
+    /**
+     * Completely loads the SchemaInfo from the input json and starts loading the entire schema.  The complete schema can be retrieved from the
+     * schema context using the getCachedSchema method
+     */
+    static async startLoadingFromJson(jsonObj, context) {
+        const schema = new Schema(context);
+        const reader = new Helper_1.SchemaReadHelper(JsonParser_1.JsonParser, context);
+        const rawSchema = typeof jsonObj === "string" ? JSON.parse(jsonObj) : jsonObj;
+        return reader.readSchemaInfo(schema, rawSchema);
+    }
     static async fromJson(jsonObj, context) {
         let schema = new Schema(context);
         const reader = new Helper_1.SchemaReadHelper(JsonParser_1.JsonParser, context);
@@ -66501,6 +66661,9 @@ class Schema {
         schema = await reader.readSchema(schema, rawSchema);
         return schema;
     }
+    /**
+     * Completely loads the Schema from the input json. The schema is cached in the schema context.
+     */
     static fromJsonSync(jsonObj, context) {
         let schema = new Schema(context);
         const reader = new Helper_1.SchemaReadHelper(JsonParser_1.JsonParser, context);
@@ -67026,6 +67189,14 @@ class SchemaJsonLocater {
     async getSchema(schemaKey, matchType, context) {
         return this.getSchemaSync(schemaKey, matchType, context);
     }
+    /**
+     * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
+     * @param schemaKey The SchemaKey describing the schema to get from the cache.
+     * @param matchType The match type to use when locating the schema
+     */
+    async getSchemaInfo(schemaKey, matchType, context) {
+        return this.getSchema(schemaKey, matchType, context);
+    }
     /** Get a schema by [SchemaKey] synchronously.
      * @param schemaKey The [SchemaKey] that identifies the schema.
      * * @param matchType The [SchemaMatchType] to used for comparing schema versions.
@@ -68522,7 +68693,7 @@ Object.defineProperty(exports, "SchemaGraph", ({ enumerable: true, get: function
 /*!*****************************************************************!*\
   !*** ../../core/ecschema-metadata/lib/cjs/utils/SchemaGraph.js ***!
   \*****************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -68532,22 +68703,32 @@ Object.defineProperty(exports, "SchemaGraph", ({ enumerable: true, get: function
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SchemaGraph = void 0;
+const ECObjects_1 = __webpack_require__(/*! ../ECObjects */ "../../core/ecschema-metadata/lib/cjs/ECObjects.js");
+const Exception_1 = __webpack_require__(/*! ../Exception */ "../../core/ecschema-metadata/lib/cjs/Exception.js");
 /**
  * Utility class for detecting cyclic references in a Schema graph.
- * @beta
+ * @internal
  */
 class SchemaGraph {
+    constructor() {
+        this._schemas = [];
+    }
+    find(schemaKey) {
+        return this._schemas.find((info) => info.schemaKey.matches(schemaKey, ECObjects_1.SchemaMatchType.Latest));
+    }
     /**
-     * Initializes a new SchemaGraph instance.
-     * @param schema The schema to analyze.
+     * Detected cyclic references in a schema and throw an exception if a cycle is found.
      */
-    constructor(schema) {
-        this._schemas = [];
-        this.populateGraph(schema);
+    throwIfCycles() {
+        const cycles = this.detectCycles();
+        if (cycles) {
+            const result = cycles.map((cycle) => `${cycle.schema.schemaKey.name} --> ${cycle.refSchema.schemaKey.name}`).join(", ");
+            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidECJson, `Schema '${this._schemas[0].schemaKey.name}' has reference cycles: ${result}`);
+        }
     }
     /**
      * Detected cyclic references in a schema.
-     * @returns True if a cycle is found.
+     * @returns An array describing the cycle if there is a cycle or undefined if no cycles found.
      */
     detectCycles() {
         const visited = {};
@@ -68562,31 +68743,70 @@ class SchemaGraph {
     }
     detectCycleUtil(schema, visited, recStack, cycles) {
         let cycleFound = false;
-        if (!visited[schema.name]) {
-            visited[schema.name] = true;
-            recStack[schema.name] = true;
-            for (const refSchema of schema.references) {
-                if (!visited[refSchema.name] && this.detectCycleUtil(refSchema, visited, recStack, cycles)) {
+        if (!visited[schema.schemaKey.name]) {
+            visited[schema.schemaKey.name] = true;
+            recStack[schema.schemaKey.name] = true;
+            for (const refKey of schema.references) {
+                const refSchema = this.find(refKey.schemaKey);
+                if (undefined === refSchema)
+                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLoadSchema, `Could not find the schema info for ref schema ${refKey.schemaKey.toString()} for schema ${schema.schemaKey.toString()}`);
+                if (!visited[refKey.schemaKey.name] && this.detectCycleUtil(refSchema, visited, recStack, cycles)) {
                     cycles.push({ schema, refSchema });
                     cycleFound = true;
                 }
-                else if (recStack[refSchema.name]) {
+                else if (recStack[refKey.schemaKey.name]) {
                     cycles.push({ schema, refSchema });
                     cycleFound = true;
                 }
             }
         }
         if (!cycleFound)
-            recStack[schema.name] = false;
+            recStack[schema.schemaKey.name] = false;
         return cycleFound;
     }
-    populateGraph(schema) {
-        if (this._schemas.includes(schema))
-            return;
-        this._schemas.push(schema);
-        for (const refSchema of schema.references) {
-            this.populateGraph(refSchema);
-        }
+    /**
+     * Generates a SchemaGraph for the input schema using the context to find info on referenced schemas.  Use the generateGraphSync if you have the fully loaded Schema.
+     * @param schema The SchemaInfo to build the graph from
+     * @param context The SchemaContext used to locate info on the referenced schemas
+     * @returns A SchemaGraph that can be used to detect schema cycles
+     */
+    static async generateGraph(schema, context) {
+        const graph = new SchemaGraph();
+        const genGraph = async (s) => {
+            if (graph.find(s.schemaKey))
+                return;
+            graph._schemas.push(s);
+            for (const refSchema of s.references) {
+                if (!graph.find(refSchema.schemaKey)) {
+                    const refInfo = await context.getSchemaInfo(refSchema.schemaKey, ECObjects_1.SchemaMatchType.LatestWriteCompatible);
+                    if (undefined === refInfo) {
+                        throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.UnableToLocateSchema, `Could not locate the referenced schema, ${refSchema.schemaKey.name}.${refSchema.schemaKey.version.toString()}, of ${s.schemaKey.name} when populating the graph for ${schema.schemaKey.name}`);
+                    }
+                    await genGraph(refInfo);
+                }
+            }
+        };
+        await genGraph(schema);
+        return graph;
+    }
+    /**
+     * Generates a SchemaGraph for the input schema.  Use the generateGraph if you just have schema info.
+     * @param schema The Schema to build the graph from.
+     * @returns A SchemaGraph that can be used to detect schema cycles
+     */
+    static generateGraphSync(schema) {
+        const graph = new SchemaGraph();
+        const genGraph = (s) => {
+            if (graph.find(s.schemaKey))
+                return;
+            graph._schemas.push(s);
+            for (const refSchema of s.references) {
+                if (!graph.find(refSchema.schemaKey))
+                    genGraph(refSchema);
+            }
+        };
+        genGraph(schema);
+        return graph;
     }
 }
 exports.SchemaGraph = SchemaGraph;
@@ -68690,10 +68910,21 @@ class ECSchemaRpcLocater {
      * @param context The SchemaContext that will control the lifetime of the schema and holds the schema's references, if they exist.
     */
     async getSchema(schemaKey, matchType, context) {
+        await this.getSchemaInfo(schemaKey, matchType, context);
+        const schema = await context.getCachedSchema(schemaKey, matchType);
+        return schema;
+    }
+    /**
+      * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
+      * The fully loaded schema can be accessed via the schema context using the getCachedSchema method.
+      * @param schemaKey The SchemaKey describing the schema to get from the cache.
+      * @param matchType The match type to use when locating the schema
+      */
+    async getSchemaInfo(schemaKey, matchType, context) {
         const schemaJson = await ECSchemaRpcInterface_1.ECSchemaRpcInterface.getClient().getSchemaJSON(this.token, schemaKey.name);
-        const schema = await ecschema_metadata_1.Schema.fromJson(schemaJson, context || new ecschema_metadata_1.SchemaContext());
-        if (schema !== undefined && schema.schemaKey.matches(schemaKey, matchType)) {
-            return schema;
+        const schemaInfo = await ecschema_metadata_1.Schema.startLoadingFromJson(schemaJson, context || new ecschema_metadata_1.SchemaContext());
+        if (schemaInfo !== undefined && schemaInfo.schemaKey.matches(schemaKey, matchType)) {
+            return schemaInfo;
         }
         return undefined;
     }
@@ -72561,9 +72792,13 @@ class AccuSnap {
                 this.aSnapHits.removeCurrentHit();
                 hit = await this.getAccuSnapDetail(this.aSnapHits, out);
             }
+            if (!this._doSnapping)
+                hit = undefined; // Snap no longer requested...
         }
         else if (this.isLocateEnabled) {
             hit = await this.findLocatableHit(ev, false, out); // get next AccuSnap path (or undefined)
+            if (!this.isLocateEnabled)
+                hit = undefined; // Hit no longer requested...
         }
         // set the current hit
         if (hit || this.currHit)
@@ -72584,9 +72819,13 @@ class AccuSnap {
             if (this._doSnapping) {
                 out.snapStatus = this.findHits(ev);
                 hit = (_ElementLocateManager__WEBPACK_IMPORTED_MODULE_2__.SnapStatus.Success !== out.snapStatus) ? undefined : await this.getAccuSnapDetail(this.aSnapHits, out);
+                if (!this._doSnapping)
+                    hit = undefined; // Snap no longer requested...
             }
             else if (this.isLocateEnabled) {
                 hit = await this.findLocatableHit(ev, true, out);
+                if (!this.isLocateEnabled)
+                    hit = undefined; // Hit no longer requested...
             }
         }
         // set the current hit and display the sprite (based on snap's KeypointType)
@@ -79341,9 +79580,7 @@ class IModelApp {
     static get applicationVersion() { return this._applicationVersion; }
     /** True after [[startup]] has been called, until [[shutdown]] is called. */
     static get initialized() { return this._initialized; }
-    /** Provides access to the IModelHub implementation for this IModelApp.
-     * @internal
-     */
+    /** Provides access to IModelHub services. */
     static get hubAccess() { return this._hubAccess; }
     /** Provides access to the RealityData service implementation for this IModelApp
      * @beta
@@ -95206,65 +95443,6 @@ class ExtensionHost {
 }
 
 
-/***/ }),
-
-/***/ "../../core/frontend/lib/esm/extension/ExtensionImpl.js":
-/*!**************************************************************!*\
-  !*** ../../core/frontend/lib/esm/extension/ExtensionImpl.js ***!
-  \**************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "ExtensionImpl": () => (/* binding */ ExtensionImpl),
-/* harmony export */   "ToolProvider": () => (/* binding */ ToolProvider)
-/* harmony export */ });
-/* harmony import */ var _IModelApp__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../IModelApp */ "../../core/frontend/lib/esm/IModelApp.js");
-/* harmony import */ var _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/appui-abstract */ "../../ui/appui-abstract/lib/esm/appui-abstract.js");
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module Extensions
- */
-
-
-/** @alpha */
-class ToolProvider {
-    constructor(tool) {
-        this._toolId = "";
-        this.id = `ToolProvider:${tool.toolId}`;
-        this._toolId = tool.toolId;
-        this._toolIcon = tool.iconSpec;
-        this._toolLabel = tool.description;
-    }
-    provideToolbarButtonItems(_stageId, stageUsage, toolbarUsage, toolbarOrientation) {
-        const toolbarItem = _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__.ToolbarItemUtilities.createActionButton(this._toolId, 0, this._toolIcon, this._toolLabel, async () => {
-            await _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.tools.run(this._toolId);
-        });
-        return stageUsage === _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__.StageUsage.General && toolbarUsage === _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__.ToolbarUsage.ContentManipulation && toolbarOrientation === _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__.ToolbarOrientation.Vertical ? [toolbarItem] : []; // eslint-disable-line deprecation/deprecation
-    }
-}
-/** @alpha */
-class ExtensionImpl {
-    constructor(_id) {
-        this._id = _id;
-    }
-    async registerTool(tool, onRegistered) {
-        try {
-            _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.tools.register(tool);
-            _itwin_appui_abstract__WEBPACK_IMPORTED_MODULE_1__.UiItemsManager.register(new ToolProvider(tool)); // eslint-disable-line deprecation/deprecation
-            onRegistered?.();
-        }
-        catch (e) {
-            console.log(`Error registering tool: ${e}`); // eslint-disable-line
-        }
-    }
-}
-
-
 /***/ }),
 
 /***/ "../../core/frontend/lib/esm/extension/ExtensionRuntime.js":
@@ -95275,10 +95453,9 @@ class ExtensionImpl {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _ExtensionImpl__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ExtensionImpl */ "../../core/frontend/lib/esm/extension/ExtensionImpl.js");
-/* harmony import */ var _ExtensionHost__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ExtensionHost */ "../../core/frontend/lib/esm/extension/ExtensionHost.js");
-/* harmony import */ var _core_frontend__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../core-frontend */ "../../core/frontend/lib/esm/core-frontend.js");
-/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
+/* harmony import */ var _ExtensionHost__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ExtensionHost */ "../../core/frontend/lib/esm/extension/ExtensionHost.js");
+/* harmony import */ var _core_frontend__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../core-frontend */ "../../core/frontend/lib/esm/core-frontend.js");
+/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -95290,7 +95467,6 @@ __webpack_require__.r(__webpack_exports__);
 /* eslint-disable @itwin/no-internal-barrel-imports */
 /* eslint-disable sort-imports */
 
-
 const globalSymbol = Symbol.for("itwin.core.frontend.globals");
 if (globalThis[globalSymbol])
     throw new Error("Multiple @itwin/core-frontend imports detected!");
@@ -95298,265 +95474,264 @@ if (globalThis[globalSymbol])
 
 
 const extensionExports = {
-    ACSDisplayOptions: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ACSDisplayOptions,
-    ACSType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ACSType,
-    AccuDrawHintBuilder: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AccuDrawHintBuilder,
-    AccuSnap: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AccuSnap,
-    ActivityMessageDetails: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ActivityMessageDetails,
-    ActivityMessageEndReason: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ActivityMessageEndReason,
-    AuxCoordSystem2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AuxCoordSystem2dState,
-    AuxCoordSystem3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AuxCoordSystem3dState,
-    AuxCoordSystemSpatialState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AuxCoordSystemSpatialState,
-    AuxCoordSystemState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.AuxCoordSystemState,
-    BackgroundFill: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.BackgroundFill,
-    BackgroundMapType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.BackgroundMapType,
-    BatchType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.BatchType,
-    BeButton: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeButton,
-    BeButtonEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeButtonEvent,
-    BeButtonState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeButtonState,
-    BeModifierKeys: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeModifierKeys,
-    BeTouchEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeTouchEvent,
-    BeWheelEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BeWheelEvent,
-    BingElevationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BingElevationProvider,
-    BingLocationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.BingLocationProvider,
-    BisCodeSpec: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.BisCodeSpec,
-    BriefcaseIdValue: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.BriefcaseIdValue,
-    CategorySelectorState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.CategorySelectorState,
-    ChangeFlags: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ChangeFlags,
-    ChangeOpCode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ChangeOpCode,
-    ChangedValueState: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ChangedValueState,
-    ChangesetType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ChangesetType,
-    ClipEventType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ClipEventType,
-    Cluster: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Cluster,
-    ColorByName: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ColorByName,
-    ColorDef: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ColorDef,
-    CommonLoggerCategory: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.CommonLoggerCategory,
-    ContextRealityModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ContextRealityModelState,
-    ContextRotationId: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ContextRotationId,
-    CoordSource: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.CoordSource,
-    CoordSystem: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.CoordSystem,
-    CoordinateLockOverrides: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.CoordinateLockOverrides,
-    DecorateContext: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DecorateContext,
-    Decorations: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Decorations,
-    DisclosedTileTreeSet: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DisclosedTileTreeSet,
-    DisplayStyle2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DisplayStyle2dState,
-    DisplayStyle3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DisplayStyle3dState,
-    DisplayStyleState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DisplayStyleState,
-    DrawingModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DrawingModelState,
-    DrawingViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.DrawingViewState,
-    ECSqlSystemProperty: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ECSqlSystemProperty,
-    ECSqlValueType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ECSqlValueType,
-    EditManipulator: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.EditManipulator,
-    ElementGeometryOpcode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ElementGeometryOpcode,
-    ElementLocateManager: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ElementLocateManager,
-    ElementPicker: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ElementPicker,
-    ElementState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ElementState,
-    EmphasizeElements: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.EmphasizeElements,
-    EntityState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.EntityState,
-    EventController: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.EventController,
-    EventHandled: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.EventHandled,
-    FeatureOverrideType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.FeatureOverrideType,
-    FeatureSymbology: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.FeatureSymbology,
-    FillDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.FillDisplay,
-    FillFlags: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.FillFlags,
-    FlashMode: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.FlashMode,
-    FlashSettings: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.FlashSettings,
-    FontType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.FontType,
-    FrontendLoggerCategory: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.FrontendLoggerCategory,
-    FrustumAnimator: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.FrustumAnimator,
-    FrustumPlanes: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.FrustumPlanes,
-    GeoCoordStatus: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GeoCoordStatus,
-    GeometricModel2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GeometricModel2dState,
-    GeometricModel3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GeometricModel3dState,
-    GeometricModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GeometricModelState,
-    GeometryClass: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GeometryClass,
-    GeometryStreamFlags: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GeometryStreamFlags,
-    GeometrySummaryVerbosity: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GeometrySummaryVerbosity,
-    GlobeAnimator: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GlobeAnimator,
-    GlobeMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GlobeMode,
-    GraphicBranch: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GraphicBranch,
-    GraphicBuilder: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GraphicBuilder,
-    GraphicType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.GraphicType,
-    GridOrientationType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.GridOrientationType,
-    HSVConstants: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.HSVConstants,
-    HiliteSet: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HiliteSet,
-    HitDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitDetail,
-    HitDetailType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitDetailType,
-    HitGeomType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitGeomType,
-    HitList: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitList,
-    HitParentGeomType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitParentGeomType,
-    HitPriority: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitPriority,
-    HitSource: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.HitSource,
-    IModelConnection: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.IModelConnection,
-    IconSprites: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.IconSprites,
-    ImageBufferFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ImageBufferFormat,
-    ImageSourceFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ImageSourceFormat,
-    InputCollector: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.InputCollector,
-    InputSource: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.InputSource,
-    InteractiveTool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.InteractiveTool,
-    IntersectDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.IntersectDetail,
-    KeyinParseError: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.KeyinParseError,
-    LinePixels: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.LinePixels,
-    LocateAction: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.LocateAction,
-    LocateFilterStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.LocateFilterStatus,
-    LocateOptions: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.LocateOptions,
-    LocateResponse: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.LocateResponse,
-    ManipulatorToolEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ManipulatorToolEvent,
-    MarginPercent: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.MarginPercent,
-    Marker: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Marker,
-    MarkerSet: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.MarkerSet,
-    MassPropertiesOperation: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.MassPropertiesOperation,
-    MessageBoxIconType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.MessageBoxIconType,
-    MessageBoxType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.MessageBoxType,
-    MessageBoxValue: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.MessageBoxValue,
-    ModelSelectorState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ModelSelectorState,
-    ModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ModelState,
-    MonochromeMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.MonochromeMode,
-    NotificationHandler: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.NotificationHandler,
-    NotificationManager: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.NotificationManager,
-    NotifyMessageDetails: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.NotifyMessageDetails,
-    Npc: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.Npc,
-    OffScreenViewport: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.OffScreenViewport,
-    OrthographicViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.OrthographicViewState,
-    OutputMessageAlert: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.OutputMessageAlert,
-    OutputMessagePriority: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.OutputMessagePriority,
-    OutputMessageType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.OutputMessageType,
-    ParseAndRunResult: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ParseAndRunResult,
-    PerModelCategoryVisibility: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.PerModelCategoryVisibility,
-    PhysicalModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.PhysicalModelState,
-    Pixel: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Pixel,
-    PlanarClipMaskMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.PlanarClipMaskMode,
-    PlanarClipMaskPriority: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.PlanarClipMaskPriority,
-    PrimitiveTool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.PrimitiveTool,
-    QParams2d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QParams2d,
-    QParams3d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QParams3d,
-    QPoint2d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint2d,
-    QPoint2dBuffer: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint2dBuffer,
-    QPoint2dBufferBuilder: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint2dBufferBuilder,
-    QPoint2dList: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint2dList,
-    QPoint3d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint3d,
-    QPoint3dBuffer: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint3dBuffer,
-    QPoint3dBufferBuilder: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint3dBufferBuilder,
-    QPoint3dList: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QPoint3dList,
-    Quantization: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.Quantization,
-    QueryRowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.QueryRowFormat,
-    Rank: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.Rank,
-    RenderClipVolume: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.RenderClipVolume,
-    RenderContext: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.RenderContext,
-    RenderGraphic: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.RenderGraphic,
-    RenderGraphicOwner: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.RenderGraphicOwner,
-    RenderMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.RenderMode,
-    RenderSystem: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.RenderSystem,
-    Scene: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Scene,
-    ScreenViewport: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ScreenViewport,
-    SectionDrawingModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SectionDrawingModelState,
-    SectionType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.SectionType,
-    SelectionMethod: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SelectionMethod,
-    SelectionMode: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SelectionMode,
-    SelectionProcessing: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SelectionProcessing,
-    SelectionSet: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SelectionSet,
-    SelectionSetEventType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SelectionSetEventType,
-    SheetModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SheetModelState,
-    SheetViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SheetViewState,
-    SkyBoxImageType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.SkyBoxImageType,
-    SnapDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SnapDetail,
-    SnapHeat: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SnapHeat,
-    SnapMode: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SnapMode,
-    SnapStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SnapStatus,
-    SpatialClassifierInsideDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.SpatialClassifierInsideDisplay,
-    SpatialClassifierOutsideDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.SpatialClassifierOutsideDisplay,
-    SpatialLocationModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SpatialLocationModelState,
-    SpatialModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SpatialModelState,
-    SpatialViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SpatialViewState,
-    Sprite: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Sprite,
-    SpriteLocation: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.SpriteLocation,
-    StandardViewId: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.StandardViewId,
-    StartOrResume: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.StartOrResume,
-    SyncMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.SyncMode,
-    TentativePoint: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TentativePoint,
-    TerrainHeightOriginMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.TerrainHeightOriginMode,
-    TextureMapUnits: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.TextureMapUnits,
-    ThematicDisplayMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ThematicDisplayMode,
-    ThematicGradientColorScheme: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ThematicGradientColorScheme,
-    ThematicGradientMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ThematicGradientMode,
-    Tile: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Tile,
-    TileAdmin: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileAdmin,
-    TileBoundingBoxes: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileBoundingBoxes,
-    TileDrawArgs: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileDrawArgs,
-    TileGraphicType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileGraphicType,
-    TileLoadPriority: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileLoadPriority,
-    TileLoadStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileLoadStatus,
-    TileRequest: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileRequest,
-    TileRequestChannel: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileRequestChannel,
-    TileRequestChannelStatistics: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileRequestChannelStatistics,
-    TileRequestChannels: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileRequestChannels,
-    TileTree: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileTree,
-    TileTreeLoadStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileTreeLoadStatus,
-    TileTreeReference: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileTreeReference,
-    TileUsageMarker: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileUsageMarker,
-    TileVisibility: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TileVisibility,
-    Tiles: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Tiles,
-    Tool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Tool,
-    ToolAdmin: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ToolAdmin,
-    ToolAssistance: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ToolAssistance,
-    ToolAssistanceImage: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ToolAssistanceImage,
-    ToolAssistanceInputMethod: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ToolAssistanceInputMethod,
-    ToolSettings: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ToolSettings,
-    TwoWayViewportFrustumSync: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TwoWayViewportFrustumSync,
-    TwoWayViewportSync: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.TwoWayViewportSync,
-    TxnAction: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.TxnAction,
-    TypeOfChange: _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.TypeOfChange,
-    UniformType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.UniformType,
-    VaryingType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.VaryingType,
-    ViewClipClearTool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewClipClearTool,
-    ViewClipDecoration: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewClipDecoration,
-    ViewClipDecorationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewClipDecorationProvider,
-    ViewClipTool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewClipTool,
-    ViewCreator2d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewCreator2d,
-    ViewCreator3d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewCreator3d,
-    ViewManager: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewManager,
-    ViewManip: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewManip,
-    ViewPose: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewPose,
-    ViewPose2d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewPose2d,
-    ViewPose3d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewPose3d,
-    ViewRect: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewRect,
-    ViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewState,
-    ViewState2d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewState2d,
-    ViewState3d: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewState3d,
-    ViewStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewStatus,
-    ViewTool: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewTool,
-    ViewingSpace: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.ViewingSpace,
-    Viewport: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.Viewport,
-    canvasToImageBuffer: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.canvasToImageBuffer,
-    canvasToResizedCanvasWithBars: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.canvasToResizedCanvasWithBars,
-    connectViewportFrusta: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.connectViewportFrusta,
-    connectViewportViews: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.connectViewportViews,
-    connectViewports: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.connectViewports,
-    extractImageSourceDimensions: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.extractImageSourceDimensions,
-    getCompressedJpegFromCanvas: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.getCompressedJpegFromCanvas,
-    getImageSourceFormatForMimeType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.getImageSourceFormatForMimeType,
-    getImageSourceMimeType: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.getImageSourceMimeType,
-    imageBufferToBase64EncodedPng: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.imageBufferToBase64EncodedPng,
-    imageBufferToCanvas: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.imageBufferToCanvas,
-    imageBufferToPngDataUrl: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.imageBufferToPngDataUrl,
-    imageElementFromImageSource: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.imageElementFromImageSource,
-    imageElementFromUrl: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.imageElementFromUrl,
-    queryTerrainElevationOffset: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.queryTerrainElevationOffset,
-    readElementGraphics: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.readElementGraphics,
-    readGltfGraphics: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.readGltfGraphics,
-    synchronizeViewportFrusta: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.synchronizeViewportFrusta,
-    synchronizeViewportViews: _core_frontend__WEBPACK_IMPORTED_MODULE_2__.synchronizeViewportViews,
+    ACSDisplayOptions: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ACSDisplayOptions,
+    ACSType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ACSType,
+    AccuDrawHintBuilder: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AccuDrawHintBuilder,
+    AccuSnap: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AccuSnap,
+    ActivityMessageDetails: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ActivityMessageDetails,
+    ActivityMessageEndReason: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ActivityMessageEndReason,
+    AuxCoordSystem2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AuxCoordSystem2dState,
+    AuxCoordSystem3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AuxCoordSystem3dState,
+    AuxCoordSystemSpatialState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AuxCoordSystemSpatialState,
+    AuxCoordSystemState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.AuxCoordSystemState,
+    BackgroundFill: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BackgroundFill,
+    BackgroundMapType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BackgroundMapType,
+    BatchType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BatchType,
+    BeButton: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeButton,
+    BeButtonEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeButtonEvent,
+    BeButtonState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeButtonState,
+    BeModifierKeys: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeModifierKeys,
+    BeTouchEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeTouchEvent,
+    BeWheelEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BeWheelEvent,
+    BingElevationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BingElevationProvider,
+    BingLocationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.BingLocationProvider,
+    BisCodeSpec: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BisCodeSpec,
+    BriefcaseIdValue: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BriefcaseIdValue,
+    CategorySelectorState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.CategorySelectorState,
+    ChangeFlags: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ChangeFlags,
+    ChangeOpCode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ChangeOpCode,
+    ChangedValueState: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ChangedValueState,
+    ChangesetType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ChangesetType,
+    ClipEventType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ClipEventType,
+    Cluster: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Cluster,
+    ColorByName: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorByName,
+    ColorDef: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef,
+    CommonLoggerCategory: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.CommonLoggerCategory,
+    ContextRealityModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ContextRealityModelState,
+    ContextRotationId: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ContextRotationId,
+    CoordSource: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.CoordSource,
+    CoordSystem: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.CoordSystem,
+    CoordinateLockOverrides: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.CoordinateLockOverrides,
+    DecorateContext: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DecorateContext,
+    Decorations: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Decorations,
+    DisclosedTileTreeSet: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DisclosedTileTreeSet,
+    DisplayStyle2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DisplayStyle2dState,
+    DisplayStyle3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DisplayStyle3dState,
+    DisplayStyleState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DisplayStyleState,
+    DrawingModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DrawingModelState,
+    DrawingViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.DrawingViewState,
+    ECSqlSystemProperty: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ECSqlSystemProperty,
+    ECSqlValueType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ECSqlValueType,
+    EditManipulator: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.EditManipulator,
+    ElementGeometryOpcode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ElementGeometryOpcode,
+    ElementLocateManager: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ElementLocateManager,
+    ElementPicker: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ElementPicker,
+    ElementState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ElementState,
+    EmphasizeElements: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.EmphasizeElements,
+    EntityState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.EntityState,
+    EventController: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.EventController,
+    EventHandled: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.EventHandled,
+    FeatureOverrideType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FeatureOverrideType,
+    FeatureSymbology: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.FeatureSymbology,
+    FillDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FillDisplay,
+    FillFlags: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FillFlags,
+    FlashMode: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.FlashMode,
+    FlashSettings: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.FlashSettings,
+    FontType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FontType,
+    FrontendLoggerCategory: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.FrontendLoggerCategory,
+    FrustumAnimator: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.FrustumAnimator,
+    FrustumPlanes: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FrustumPlanes,
+    GeoCoordStatus: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GeoCoordStatus,
+    GeometricModel2dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GeometricModel2dState,
+    GeometricModel3dState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GeometricModel3dState,
+    GeometricModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GeometricModelState,
+    GeometryClass: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GeometryClass,
+    GeometryStreamFlags: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GeometryStreamFlags,
+    GeometrySummaryVerbosity: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GeometrySummaryVerbosity,
+    GlobeAnimator: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GlobeAnimator,
+    GlobeMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GlobeMode,
+    GraphicBranch: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GraphicBranch,
+    GraphicBuilder: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GraphicBuilder,
+    GraphicType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.GraphicType,
+    GridOrientationType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GridOrientationType,
+    HSVConstants: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.HSVConstants,
+    HiliteSet: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HiliteSet,
+    HitDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitDetail,
+    HitDetailType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitDetailType,
+    HitGeomType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitGeomType,
+    HitList: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitList,
+    HitParentGeomType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitParentGeomType,
+    HitPriority: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitPriority,
+    HitSource: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.HitSource,
+    IModelConnection: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.IModelConnection,
+    IconSprites: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.IconSprites,
+    ImageBufferFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ImageBufferFormat,
+    ImageSourceFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ImageSourceFormat,
+    InputCollector: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.InputCollector,
+    InputSource: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.InputSource,
+    InteractiveTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.InteractiveTool,
+    IntersectDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.IntersectDetail,
+    KeyinParseError: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.KeyinParseError,
+    LinePixels: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.LinePixels,
+    LocateAction: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.LocateAction,
+    LocateFilterStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.LocateFilterStatus,
+    LocateOptions: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.LocateOptions,
+    LocateResponse: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.LocateResponse,
+    ManipulatorToolEvent: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ManipulatorToolEvent,
+    MarginPercent: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.MarginPercent,
+    Marker: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Marker,
+    MarkerSet: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.MarkerSet,
+    MassPropertiesOperation: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation,
+    MessageBoxIconType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.MessageBoxIconType,
+    MessageBoxType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.MessageBoxType,
+    MessageBoxValue: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.MessageBoxValue,
+    ModelSelectorState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ModelSelectorState,
+    ModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ModelState,
+    MonochromeMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MonochromeMode,
+    NotificationHandler: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.NotificationHandler,
+    NotificationManager: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.NotificationManager,
+    NotifyMessageDetails: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.NotifyMessageDetails,
+    Npc: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Npc,
+    OffScreenViewport: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OffScreenViewport,
+    OrthographicViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OrthographicViewState,
+    OutputMessageAlert: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessageAlert,
+    OutputMessagePriority: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessagePriority,
+    OutputMessageType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessageType,
+    ParseAndRunResult: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ParseAndRunResult,
+    PerModelCategoryVisibility: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.PerModelCategoryVisibility,
+    PhysicalModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.PhysicalModelState,
+    Pixel: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Pixel,
+    PlanarClipMaskMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.PlanarClipMaskMode,
+    PlanarClipMaskPriority: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.PlanarClipMaskPriority,
+    PrimitiveTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.PrimitiveTool,
+    QParams2d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QParams2d,
+    QParams3d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QParams3d,
+    QPoint2d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint2d,
+    QPoint2dBuffer: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint2dBuffer,
+    QPoint2dBufferBuilder: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint2dBufferBuilder,
+    QPoint2dList: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint2dList,
+    QPoint3d: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint3d,
+    QPoint3dBuffer: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint3dBuffer,
+    QPoint3dBufferBuilder: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint3dBufferBuilder,
+    QPoint3dList: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint3dList,
+    Quantization: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Quantization,
+    QueryRowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QueryRowFormat,
+    Rank: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Rank,
+    RenderClipVolume: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.RenderClipVolume,
+    RenderContext: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.RenderContext,
+    RenderGraphic: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.RenderGraphic,
+    RenderGraphicOwner: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.RenderGraphicOwner,
+    RenderMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.RenderMode,
+    RenderSystem: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.RenderSystem,
+    Scene: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Scene,
+    ScreenViewport: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ScreenViewport,
+    SectionDrawingModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SectionDrawingModelState,
+    SectionType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.SectionType,
+    SelectionMethod: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SelectionMethod,
+    SelectionMode: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SelectionMode,
+    SelectionProcessing: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SelectionProcessing,
+    SelectionSet: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SelectionSet,
+    SelectionSetEventType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SelectionSetEventType,
+    SheetModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SheetModelState,
+    SheetViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SheetViewState,
+    SkyBoxImageType: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.SkyBoxImageType,
+    SnapDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SnapDetail,
+    SnapHeat: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SnapHeat,
+    SnapMode: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SnapMode,
+    SnapStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SnapStatus,
+    SpatialClassifierInsideDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.SpatialClassifierInsideDisplay,
+    SpatialClassifierOutsideDisplay: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.SpatialClassifierOutsideDisplay,
+    SpatialLocationModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SpatialLocationModelState,
+    SpatialModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SpatialModelState,
+    SpatialViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SpatialViewState,
+    Sprite: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Sprite,
+    SpriteLocation: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SpriteLocation,
+    StandardViewId: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.StandardViewId,
+    StartOrResume: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.StartOrResume,
+    SyncMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.SyncMode,
+    TentativePoint: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TentativePoint,
+    TerrainHeightOriginMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TerrainHeightOriginMode,
+    TextureMapUnits: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapUnits,
+    ThematicDisplayMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicDisplayMode,
+    ThematicGradientColorScheme: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicGradientColorScheme,
+    ThematicGradientMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ThematicGradientMode,
+    Tile: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Tile,
+    TileAdmin: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileAdmin,
+    TileBoundingBoxes: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileBoundingBoxes,
+    TileDrawArgs: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileDrawArgs,
+    TileGraphicType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileGraphicType,
+    TileLoadPriority: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileLoadPriority,
+    TileLoadStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileLoadStatus,
+    TileRequest: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileRequest,
+    TileRequestChannel: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileRequestChannel,
+    TileRequestChannelStatistics: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileRequestChannelStatistics,
+    TileRequestChannels: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileRequestChannels,
+    TileTree: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileTree,
+    TileTreeLoadStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileTreeLoadStatus,
+    TileTreeReference: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileTreeReference,
+    TileUsageMarker: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileUsageMarker,
+    TileVisibility: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TileVisibility,
+    Tiles: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Tiles,
+    Tool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Tool,
+    ToolAdmin: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ToolAdmin,
+    ToolAssistance: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ToolAssistance,
+    ToolAssistanceImage: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ToolAssistanceImage,
+    ToolAssistanceInputMethod: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ToolAssistanceInputMethod,
+    ToolSettings: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ToolSettings,
+    TwoWayViewportFrustumSync: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TwoWayViewportFrustumSync,
+    TwoWayViewportSync: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.TwoWayViewportSync,
+    TxnAction: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TxnAction,
+    TypeOfChange: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TypeOfChange,
+    UniformType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.UniformType,
+    VaryingType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.VaryingType,
+    ViewClipClearTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewClipClearTool,
+    ViewClipDecoration: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewClipDecoration,
+    ViewClipDecorationProvider: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewClipDecorationProvider,
+    ViewClipTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewClipTool,
+    ViewCreator2d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewCreator2d,
+    ViewCreator3d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewCreator3d,
+    ViewManager: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewManager,
+    ViewManip: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewManip,
+    ViewPose: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewPose,
+    ViewPose2d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewPose2d,
+    ViewPose3d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewPose3d,
+    ViewRect: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewRect,
+    ViewState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewState,
+    ViewState2d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewState2d,
+    ViewState3d: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewState3d,
+    ViewStatus: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewStatus,
+    ViewTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewTool,
+    ViewingSpace: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ViewingSpace,
+    Viewport: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Viewport,
+    canvasToImageBuffer: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.canvasToImageBuffer,
+    canvasToResizedCanvasWithBars: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.canvasToResizedCanvasWithBars,
+    connectViewportFrusta: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.connectViewportFrusta,
+    connectViewportViews: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.connectViewportViews,
+    connectViewports: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.connectViewports,
+    extractImageSourceDimensions: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.extractImageSourceDimensions,
+    getCompressedJpegFromCanvas: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.getCompressedJpegFromCanvas,
+    getImageSourceFormatForMimeType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.getImageSourceFormatForMimeType,
+    getImageSourceMimeType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.getImageSourceMimeType,
+    imageBufferToBase64EncodedPng: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.imageBufferToBase64EncodedPng,
+    imageBufferToCanvas: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.imageBufferToCanvas,
+    imageBufferToPngDataUrl: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.imageBufferToPngDataUrl,
+    imageElementFromImageSource: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.imageElementFromImageSource,
+    imageElementFromUrl: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.imageElementFromUrl,
+    queryTerrainElevationOffset: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.queryTerrainElevationOffset,
+    readElementGraphics: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.readElementGraphics,
+    readGltfGraphics: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.readGltfGraphics,
+    synchronizeViewportFrusta: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.synchronizeViewportFrusta,
+    synchronizeViewportViews: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.synchronizeViewportViews,
 };
 // END GENERATED CODE
-const getExtensionApi = (id) => {
+const getExtensionApi = (_id) => {
     return {
         exports: {
             // exceptions
-            ExtensionHost: _ExtensionHost__WEBPACK_IMPORTED_MODULE_1__.ExtensionHost,
+            ExtensionHost: _ExtensionHost__WEBPACK_IMPORTED_MODULE_0__.ExtensionHost,
             // automated
             ...extensionExports,
         },
-        api: new _ExtensionImpl__WEBPACK_IMPORTED_MODULE_0__.ExtensionImpl(id),
     };
 };
 globalThis[globalSymbol] = {
@@ -142209,8 +142384,9 @@ class TileAdmin {
         // start dynamically loading default implementation and save the promise to avoid duplicate instances
         this._tileStoragePromise = (async () => {
             await __webpack_require__.e(/*! import() */ "vendors-common_temp_node_modules_pnpm_reflect-metadata_0_1_13_node_modules_reflect-metadata_R-610cb3").then(__webpack_require__.t.bind(__webpack_require__, /*! reflect-metadata */ "../../common/temp/node_modules/.pnpm/reflect-metadata@0.1.13/node_modules/reflect-metadata/Reflect.js", 23));
+            const objectStorage = await Promise.all(/*! import() | object-storage-azure */[__webpack_require__.e("vendors-common_temp_node_modules_pnpm_reflect-metadata_0_1_13_node_modules_reflect-metadata_R-610cb3"), __webpack_require__.e("vendors-common_temp_node_modules_pnpm_itwin_object-storage-azure_1_6_0_node_modules_itwin_obj-0f69b1"), __webpack_require__.e("object-storage-azure")]).then(__webpack_require__.t.bind(__webpack_require__, /*! @itwin/object-storage-azure/lib/frontend */ "../../common/temp/node_modules/.pnpm/@itwin+object-storage-azure@1.6.0/node_modules/@itwin/object-storage-azure/lib/frontend/index.js", 23));
             // eslint-disable-next-line @typescript-eslint/naming-convention
-            const { AzureFrontendStorage, FrontendBlockBlobClientWrapperFactory } = await Promise.all(/*! import() | object-storage */[__webpack_require__.e("vendors-common_temp_node_modules_pnpm_reflect-metadata_0_1_13_node_modules_reflect-metadata_R-610cb3"), __webpack_require__.e("vendors-common_temp_node_modules_pnpm_itwin_object-storage-azure_1_6_0_node_modules_itwin_obj-0f69b1"), __webpack_require__.e("object-storage")]).then(__webpack_require__.t.bind(__webpack_require__, /*! @itwin/object-storage-azure/lib/frontend */ "../../common/temp/node_modules/.pnpm/@itwin+object-storage-azure@1.6.0/node_modules/@itwin/object-storage-azure/lib/frontend/index.js", 23));
+            const { AzureFrontendStorage, FrontendBlockBlobClientWrapperFactory } = objectStorage.default ?? objectStorage;
             const azureStorage = new AzureFrontendStorage(new FrontendBlockBlobClientWrapperFactory());
             this._tileStorage = new _internal__WEBPACK_IMPORTED_MODULE_6__.TileStorage(azureStorage);
             return this._tileStorage;
@@ -149497,7 +149673,8 @@ class MapTile extends _internal__WEBPACK_IMPORTED_MODULE_7__.RealityTile {
     }
     /** @internal */
     minimumVisibleFactor() {
-        return 0.25;
+        // if minimumVisibleFactor is more than 0, it stops parents from loading when children are not ready, to fill in gaps
+        return 0.0;
     }
     /** @internal */
     getDrapeTextures() {
@@ -166781,17 +166958,20 @@ class Geometry {
         if (a2b2 > 0.0) {
             const a2b2r = 1.0 / a2b2; // 1/(a^2+b^2)
             const d2a2b2 = d2 * a2b2r; // d^2/(a^2+b^2)
-            const criteria = 1.0 - d2a2b2; // 1 - d^2/(a^2+b^2); the criteria to specify how many solutions we got
-            if (criteria < -Geometry.smallMetricDistanceSquared) // nSolution = 0
+            const criterion = 1.0 - d2a2b2; // 1 - d^2/(a^2+b^2);
+            if (criterion < -Geometry.smallMetricDistanceSquared) // nSolution = 0
                 return result;
             const da2b2 = -constCoff * a2b2r; // -d/(a^2+b^2)
+            // (c0,s0) is the closest approach of the line to the circle center (origin)
             const c0 = da2b2 * cosCoff; // -ad/(a^2+b^2)
             const s0 = da2b2 * sinCoff; // -bd/(a^2+b^2)
-            if (criteria <= 0.0) { // nSolution = 1 (observed criteria = -2.22e-16 in rotated system)
+            if (criterion <= 0.0) { // nSolution = 1
+                // We observed criterion = -2.22e-16 in a rotated tangent system, therefore for negative criteria near
+                // zero, return the near-tangency; for tiny positive criteria, fall through to return both solutions.
                 result = [_geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_1__.Vector2d.create(c0, s0)];
             }
-            else if (criteria > 0.0) { // nSolution = 2
-                const s = Math.sqrt(criteria * a2b2r); // sqrt(a^2+b^2-d^2)) / (a^2+b^2)
+            else { // nSolution = 2
+                const s = Math.sqrt(criterion * a2b2r); // sqrt(a^2+b^2-d^2)) / (a^2+b^2)
                 result = [
                     _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_1__.Vector2d.create(c0 - s * sinCoff, s0 + s * cosCoff),
                     _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_1__.Vector2d.create(c0 + s * sinCoff, s0 - s * cosCoff),
@@ -181735,12 +181915,12 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
     extendB, reversed) {
         const inverseA = matrixA.inverse();
         if (inverseA) {
-            const localB = inverseA.multiplyMatrixMatrix(matrixB);
+            const localB = inverseA.multiplyMatrixMatrix(matrixB); // localB->localA transform
             const ellipseRadians = [];
             const circleRadians = [];
             _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_6__.TrigPolynomial.solveUnitCircleHomogeneousEllipseIntersection(localB.coffs[2], localB.coffs[5], localB.coffs[8], // center xyw
-            localB.coffs[0], localB.coffs[3], localB.coffs[6], // center xyw
-            localB.coffs[1], localB.coffs[4], localB.coffs[7], // center xyw
+            localB.coffs[0], localB.coffs[3], localB.coffs[6], // vector0 xyw
+            localB.coffs[1], localB.coffs[4], localB.coffs[7], // vector90 xyw
             ellipseRadians, circleRadians);
             for (let i = 0; i < ellipseRadians.length; i++) {
                 const fractionA = cpA.sweep.radiansToSignedPeriodicFraction(circleRadians[i]);
@@ -183687,7 +183867,7 @@ function optionalVectorUpdate(source, result) {
     return undefined;
 }
 /**
- * CurveLocationDetail carries point and paramter data about a point evaluated on a curve.
+ * CurveLocationDetail carries point and parameter data about a point evaluated on a curve.
  * * These are returned by a variety of queries.
  * * Particular contents can vary among the queries.
  * @public
@@ -187931,13 +188111,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "PlanarSubdivision": () => (/* binding */ PlanarSubdivision)
 /* harmony export */ });
-/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
-/* harmony import */ var _topology_Graph__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../topology/Graph */ "../../core/geometry/lib/esm/topology/Graph.js");
-/* harmony import */ var _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../topology/HalfEdgeGraphSearch */ "../../core/geometry/lib/esm/topology/HalfEdgeGraphSearch.js");
-/* harmony import */ var _topology_Merging__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../topology/Merging */ "../../core/geometry/lib/esm/topology/Merging.js");
-/* harmony import */ var _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
-/* harmony import */ var _Loop__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
-/* harmony import */ var _RegionOps__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../RegionOps */ "../../core/geometry/lib/esm/curve/RegionOps.js");
+/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
+/* harmony import */ var _topology_Graph__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../topology/Graph */ "../../core/geometry/lib/esm/topology/Graph.js");
+/* harmony import */ var _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../topology/HalfEdgeGraphSearch */ "../../core/geometry/lib/esm/topology/HalfEdgeGraphSearch.js");
+/* harmony import */ var _topology_Merging__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../topology/Merging */ "../../core/geometry/lib/esm/topology/Merging.js");
+/* harmony import */ var _Arc3d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
+/* harmony import */ var _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
+/* harmony import */ var _LineSegment3d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
+/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _Loop__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
+/* harmony import */ var _RegionOps__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../RegionOps */ "../../core/geometry/lib/esm/curve/RegionOps.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -187949,13 +188132,16 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
 /** @packageDocumentation
  * @module Curve
  */
 class MapCurvePrimitiveToCurveLocationDetailPairArray {
     constructor() {
         this.primitiveToPair = new Map();
-        // index assigned to this primitive for this calculation.
+        // index assigned to this primitive (for debugging)
         this.primitiveToIndex = new Map();
         this._numIndexedPrimitives = 0;
     }
@@ -187987,54 +188173,63 @@ class MapCurvePrimitiveToCurveLocationDetailPairArray {
         if (primitiveB)
             this.insertPrimitiveToPair(primitiveB, pair);
     }
+    /** Split closed missing primitives in half and add new intersection pairs */
+    splitAndAppendMissingClosedPrimitives(primitives, tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallMetricDistance) {
+        for (const p of primitives) {
+            let closedCurveSplitCandidate = false;
+            if (p instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_1__.Arc3d)
+                closedCurveSplitCandidate = p.sweep.isFullCircle;
+            else if (!(p instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_2__.LineSegment3d) && !(p instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_3__.LineString3d))
+                closedCurveSplitCandidate = p.startPoint().isAlmostEqualXY(p.endPoint(), tolerance);
+            if (closedCurveSplitCandidate && !this.primitiveToPair.has(p)) {
+                const p0 = p.clonePartialCurve(0.0, 0.5);
+                const p1 = p.clonePartialCurve(0.5, 1.0);
+                if (p0 && p1) {
+                    this.insertPair(_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetailPair.createCapture(_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveEvaluatedFraction(p0, 0.0), _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveEvaluatedFraction(p1, 1.0)));
+                    this.insertPair(_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetailPair.createCapture(_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveEvaluatedFraction(p0, 1.0), _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveEvaluatedFraction(p1, 0.0)));
+                }
+            }
+        }
+    }
 }
-/*
-  function getDetailString(detail: CurveLocationDetail | undefined): string {
-    if (!detail)
-      return "{}";
-    else return tagString("primitive", this.primitiveToIndex.get(detail.curve!)) + tagString("f0", detail.fraction) + tagString("f1", detail.fraction1);
-  }
-}
-function tagString(name: string, value: number | undefined): string {
-  if (value !== undefined)
-    return "(" + name + " " + value + ")";
-  return "";
-}
-*/
 /**
  * @internal
  */
 class PlanarSubdivision {
-    /** Create a graph from an array of curves, and an array of the curves' precomputed intersections. */
-    static assembleHalfEdgeGraph(primitives, allPairs) {
+    /** Create a graph from an array of curves, and an array of the curves' precomputed intersections. Z-coordinates are ignored. */
+    static assembleHalfEdgeGraph(primitives, allPairs, mergeTolerance = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallMetricDistance) {
         const detailByPrimitive = new MapCurvePrimitiveToCurveLocationDetailPairArray(); // map from key CurvePrimitive to CurveLocationDetailPair.
-        for (const p of primitives)
-            detailByPrimitive.assignPrimitiveIndex(p);
-        for (const pair of allPairs) {
+        for (const pair of allPairs)
             detailByPrimitive.insertPair(pair);
-        }
-        const graph = new _topology_Graph__WEBPACK_IMPORTED_MODULE_0__.HalfEdgeGraph();
+        if (primitives.length > detailByPrimitive.primitiveToPair.size)
+            detailByPrimitive.splitAndAppendMissingClosedPrimitives(primitives, mergeTolerance); // otherwise, these single-primitive loops are missing from the graph
+        const graph = new _topology_Graph__WEBPACK_IMPORTED_MODULE_5__.HalfEdgeGraph();
         for (const entry of detailByPrimitive.primitiveToPair.entries()) {
             const p = entry[0];
-            const details = entry[1];
+            // convert each interval intersection into two isolated intersections
+            const details = entry[1].reduce((accumulator, detailPair) => {
+                if (!detailPair.detailA.hasFraction1)
+                    return [...accumulator, detailPair];
+                const detail = getDetailOnCurve(detailPair, p);
+                const detail0 = _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveFractionPoint(p, detail.fraction, detail.point);
+                const detail1 = _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveFractionPoint(p, detail.fraction1, detail.point1);
+                return [...accumulator, _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetailPair.createCapture(detail0, detail0), _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetailPair.createCapture(detail1, detail1)];
+            }, []);
+            // lexical sort on p intersection fraction
             details.sort((pairA, pairB) => {
                 const fractionA = getFractionOnCurve(pairA, p);
                 const fractionB = getFractionOnCurve(pairB, p);
-                if (fractionA === undefined || fractionB === undefined)
-                    return -1000.0;
                 return fractionA - fractionB;
             });
-            let detail0 = getDetailOnCurve(details[0], p);
-            this.addHalfEdge(graph, p, p.startPoint(), 0.0, detail0.point, detail0.fraction);
-            for (let i = 1; i < details.length; i++) {
-                // create (both sides of) a graph edge . . .
-                const detail1 = getDetailOnCurve(details[i], p);
-                this.addHalfEdge(graph, p, detail0.point, detail0.fraction, detail1.point, detail1.fraction);
-                detail0 = detail1;
+            let last = { point: p.startPoint(), fraction: 0.0 };
+            for (const detailPair of details) {
+                const detail = getDetailOnCurve(detailPair, p);
+                const detailFraction = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.restrictToInterval(detail.fraction, 0, 1); // truncate fraction, but don't snap point; clustering happens later
+                last = this.addHalfEdge(graph, p, last.point, last.fraction, detail.point, detailFraction, mergeTolerance);
             }
-            this.addHalfEdge(graph, p, detail0.point, detail0.fraction, p.endPoint(), 1.0);
+            this.addHalfEdge(graph, p, last.point, last.fraction, p.endPoint(), 1.0, mergeTolerance);
         }
-        _topology_Merging__WEBPACK_IMPORTED_MODULE_1__.HalfEdgeGraphMerge.clusterAndMergeXYTheta(graph, (he) => he.sortAngle);
+        _topology_Merging__WEBPACK_IMPORTED_MODULE_6__.HalfEdgeGraphMerge.clusterAndMergeXYTheta(graph, (he) => he.sortAngle);
         return graph;
     }
     /**
@@ -188046,19 +188241,21 @@ class PlanarSubdivision {
      * @param point0 start point
      * @param fraction1 end fraction
      * @param point1 end point
-     */
-    static addHalfEdge(graph, p, point0, fraction0, point1, fraction1) {
-        if (!point0.isAlmostEqual(point1)) {
-            const halfEdge = graph.createEdgeXYAndZ(point0, 0, point1, 0);
-            const detail01 = _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetail.createCurveEvaluatedFractionFraction(p, fraction0, fraction1);
-            const mate = halfEdge.edgeMate;
-            halfEdge.edgeTag = detail01;
-            halfEdge.sortData = 1.0;
-            mate.edgeTag = detail01;
-            mate.sortData = -1.0;
-            halfEdge.sortAngle = sortAngle(detail01.curve, detail01.fraction, false);
-            mate.sortAngle = sortAngle(detail01.curve, detail01.fraction1, true);
-        }
+     * @returns end point and fraction, or start point and fraction if no action
+     */
+    static addHalfEdge(graph, p, point0, fraction0, point1, fraction1, mergeTolerance = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallMetricDistance) {
+        if (point0.isAlmostEqualXY(point1, mergeTolerance))
+            return { point: point0, fraction: fraction0 };
+        const halfEdge = graph.createEdgeXYAndZ(point0, 0, point1, 0);
+        const detail01 = _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveEvaluatedFractionFraction(p, fraction0, fraction1);
+        const mate = halfEdge.edgeMate;
+        halfEdge.edgeTag = detail01;
+        halfEdge.sortData = 1.0;
+        mate.edgeTag = detail01;
+        mate.sortData = -1.0;
+        halfEdge.sortAngle = sortAngle(p, fraction0, false);
+        mate.sortAngle = sortAngle(p, fraction1, true);
+        return { point: point1, fraction: fraction1 };
     }
     /**
      * Based on computed (and toleranced) area, push the loop (pointer) onto the appropriate array of positive, negative, or sliver loops.
@@ -188067,7 +188264,7 @@ class PlanarSubdivision {
      * @returns the area (forced to zero if within tolerance)
      */
     static collectSignedLoop(loop, outLoops, zeroAreaTolerance = 1.0e-10, isSliverFace) {
-        let area = isSliverFace ? 0.0 : _RegionOps__WEBPACK_IMPORTED_MODULE_3__.RegionOps.computeXYArea(loop);
+        let area = isSliverFace ? 0.0 : _RegionOps__WEBPACK_IMPORTED_MODULE_7__.RegionOps.computeXYArea(loop);
         if (area === undefined)
             area = 0;
         if (Math.abs(area) < zeroAreaTolerance)
@@ -188083,7 +188280,7 @@ class PlanarSubdivision {
     }
     static createLoopInFace(faceSeed, announce) {
         let he = faceSeed;
-        const loop = _Loop__WEBPACK_IMPORTED_MODULE_4__.Loop.create();
+        const loop = _Loop__WEBPACK_IMPORTED_MODULE_8__.Loop.create();
         do {
             const detail = he.edgeTag;
             if (detail) {
@@ -188107,9 +188304,9 @@ class PlanarSubdivision {
         const faceHasTwoEdges = (he.faceSuccessor.faceSuccessor === he);
         let faceIsBanana = false;
         if (faceHasTwoEdges) {
-            const c0 = _topology_Merging__WEBPACK_IMPORTED_MODULE_1__.HalfEdgeGraphMerge.curvatureSortKey(he);
-            const c1 = _topology_Merging__WEBPACK_IMPORTED_MODULE_1__.HalfEdgeGraphMerge.curvatureSortKey(he.faceSuccessor.edgeMate);
-            if (!_Geometry__WEBPACK_IMPORTED_MODULE_5__.Geometry.isSameCoordinate(c0, c1)) // default tol!
+            const c0 = _topology_Merging__WEBPACK_IMPORTED_MODULE_6__.HalfEdgeGraphMerge.curvatureSortKey(he);
+            const c1 = _topology_Merging__WEBPACK_IMPORTED_MODULE_6__.HalfEdgeGraphMerge.curvatureSortKey(he.faceSuccessor.edgeMate);
+            if (!_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(c0, c1)) // default tol!
                 faceIsBanana = true; // heuristic: we could also check end curvatures, and/or higher derivatives...
         }
         return faceHasTwoEdges && !faceIsBanana;
@@ -188127,7 +188324,7 @@ class PlanarSubdivision {
         return e1;
     }
     static collectSignedLoopSetsInHalfEdgeGraph(graph, zeroAreaTolerance = 1.0e-10) {
-        const q = _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_6__.HalfEdgeGraphSearch.collectConnectedComponentsWithExteriorParityMasks(graph, undefined);
+        const q = _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_9__.HalfEdgeGraphSearch.collectConnectedComponentsWithExteriorParityMasks(graph, undefined);
         const result = [];
         const edgeMap = new Map();
         for (const faceSeeds of q) {
@@ -188142,10 +188339,10 @@ class PlanarSubdivision {
                             const e = edgeMap.get(mate);
                             if (e === undefined) {
                                 // Record this as loopA,edgeA of a shared edge to be completed later from the other side of the edge
-                                const e1 = new _Loop__WEBPACK_IMPORTED_MODULE_4__.LoopCurveLoopCurve(loopC, curveC, undefined, undefined);
+                                const e1 = new _Loop__WEBPACK_IMPORTED_MODULE_8__.LoopCurveLoopCurve(loopC, curveC, undefined, undefined);
                                 edgeMap.set(he, e1);
                             }
-                            else if (e instanceof _Loop__WEBPACK_IMPORTED_MODULE_4__.LoopCurveLoopCurve) {
+                            else if (e instanceof _Loop__WEBPACK_IMPORTED_MODULE_8__.LoopCurveLoopCurve) {
                                 e.setB(loopC, curveC);
                                 edges.push(e);
                                 edgeMap.delete(mate);
@@ -188993,27 +189190,27 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _geometry4d_MomentData__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../geometry4d/MomentData */ "../../core/geometry/lib/esm/geometry4d/MomentData.js");
 /* harmony import */ var _polyface_PolyfaceBuilder__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../polyface/PolyfaceBuilder */ "../../core/geometry/lib/esm/polyface/PolyfaceBuilder.js");
 /* harmony import */ var _topology_Graph__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../topology/Graph */ "../../core/geometry/lib/esm/topology/Graph.js");
+/* harmony import */ var _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../topology/HalfEdgeGraphSearch */ "../../core/geometry/lib/esm/topology/HalfEdgeGraphSearch.js");
 /* harmony import */ var _topology_Triangulation__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../topology/Triangulation */ "../../core/geometry/lib/esm/topology/Triangulation.js");
 /* harmony import */ var _ChainCollectorContext__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./ChainCollectorContext */ "../../core/geometry/lib/esm/curve/ChainCollectorContext.js");
 /* harmony import */ var _CurveCollection__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
 /* harmony import */ var _CurveCurve__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ./CurveCurve */ "../../core/geometry/lib/esm/curve/CurveCurve.js");
 /* harmony import */ var _CurvePrimitive__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./CurvePrimitive */ "../../core/geometry/lib/esm/curve/CurvePrimitive.js");
 /* harmony import */ var _CurveWireMomentsXYZ__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./CurveWireMomentsXYZ */ "../../core/geometry/lib/esm/curve/CurveWireMomentsXYZ.js");
+/* harmony import */ var _GeometryQuery__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
+/* harmony import */ var _internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./internalContexts/MultiChainCollector */ "../../core/geometry/lib/esm/curve/internalContexts/MultiChainCollector.js");
 /* harmony import */ var _internalContexts_PolygonOffsetContext__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./internalContexts/PolygonOffsetContext */ "../../core/geometry/lib/esm/curve/internalContexts/PolygonOffsetContext.js");
 /* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
 /* harmony import */ var _Loop__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
+/* harmony import */ var _ParityRegion__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
 /* harmony import */ var _Path__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./Path */ "../../core/geometry/lib/esm/curve/Path.js");
 /* harmony import */ var _Query_ConsolidateAdjacentPrimitivesContext__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./Query/ConsolidateAdjacentPrimitivesContext */ "../../core/geometry/lib/esm/curve/Query/ConsolidateAdjacentPrimitivesContext.js");
 /* harmony import */ var _Query_CurveSplitContext__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./Query/CurveSplitContext */ "../../core/geometry/lib/esm/curve/Query/CurveSplitContext.js");
 /* harmony import */ var _Query_InOutTests__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./Query/InOutTests */ "../../core/geometry/lib/esm/curve/Query/InOutTests.js");
 /* harmony import */ var _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Query/PlanarSubdivision */ "../../core/geometry/lib/esm/curve/Query/PlanarSubdivision.js");
 /* harmony import */ var _RegionMomentsXY__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./RegionMomentsXY */ "../../core/geometry/lib/esm/curve/RegionMomentsXY.js");
-/* harmony import */ var _internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./internalContexts/MultiChainCollector */ "../../core/geometry/lib/esm/curve/internalContexts/MultiChainCollector.js");
-/* harmony import */ var _GeometryQuery__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
 /* harmony import */ var _RegionOpsClassificationSweeps__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./RegionOpsClassificationSweeps */ "../../core/geometry/lib/esm/curve/RegionOpsClassificationSweeps.js");
 /* harmony import */ var _UnionRegion__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./UnionRegion */ "../../core/geometry/lib/esm/curve/UnionRegion.js");
-/* harmony import */ var _topology_HalfEdgeGraphSearch__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../topology/HalfEdgeGraphSearch */ "../../core/geometry/lib/esm/topology/HalfEdgeGraphSearch.js");
-/* harmony import */ var _ParityRegion__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -189252,7 +189449,7 @@ class RegionOps {
      * @param loopsB second set of loops
      * @param operation indicates Union, Intersection, Parity, AMinusB, or BMinusA
      * @param mergeTolerance absolute distance tolerance for merging loops
-     * @returns a region resulting from merging input loops and the boolean operation. May contain bridge edges connecting interior loops to exterior loops.
+     * @returns a region resulting from merging input loops and the boolean operation. May contain bridge edges added to connect interior loops to exterior loops.
      */
     static regionBooleanXY(loopsA, loopsB, operation, mergeTolerance = _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance) {
         const result = _UnionRegion__WEBPACK_IMPORTED_MODULE_11__.UnionRegion.create();
@@ -189260,7 +189457,7 @@ class RegionOps {
         context.addMembers(loopsA, loopsB);
         context.annotateAndMergeCurvesInGraph(mergeTolerance);
         const range = context.groupA.range().union(context.groupB.range());
-        const areaTol = this.computeXYAreaTolerance(range);
+        const areaTol = this.computeXYAreaTolerance(range, mergeTolerance);
         context.runClassificationSweep(operation, (_graph, face, faceType, area) => {
             // ignore danglers and null faces, but not 2-edge "banana" faces with nonzero area
             if (face.countEdgesAroundFace() < 2)
@@ -189578,23 +189775,24 @@ class RegionOps {
     }
     /**
      * Find all areas bounded by the unstructured, possibly intersecting curves.
-     * * This method performs no merging of nearly coincident edges and vertices, which can lead to unexpected results
-     * given sufficiently imprecise input. Input geometry consisting of regions can be merged for better results by pre-processing with
-     * [[regionBooleanXY]].
+     * * A common use case of this method is to assemble the bounding "exterior" loop (or loops) containing the input curves.
+     * * This method does not add bridge edges to connect outer loops to inner loops. Each disconnected loop, regardless
+     * of its containment, is returned as its own SignedLoops object. Pre-process with [[regionBooleanXY]] to add bridge edges so that
+     * [[constructAllXYRegionLoops]] will return outer and inner loops in the same SignedLoops object.
      * @param curvesAndRegions Any collection of curves. Each Loop/ParityRegion/UnionRegion contributes its curve primitives.
+     * @param tolerance optional distance tolerance for coincidence
      * @returns array of [[SignedLoops]], each entry of which describes the faces in a single connected component:
      *    * `positiveAreaLoops` contains "interior" loops, _including holes in ParityRegion input_. These loops have positive area and counterclockwise orientation.
      *    * `negativeAreaLoops` contains (probably just one) "exterior" loop which is ordered clockwise.
      *    * `slivers` contains sliver loops that have zero area, such as appear between coincident curves.
      *    * `edges` contains a [[LoopCurveLoopCurve]] object for each component edge, collecting both loops adjacent to the edge and a constituent curve in each.
      */
-    static constructAllXYRegionLoops(curvesAndRegions) {
-        const primitivesA = RegionOps.collectCurvePrimitives(curvesAndRegions, undefined, true);
-        const primitivesB = this.expandLineStrings(primitivesA);
-        const range = this.curveArrayRange(primitivesB);
-        const areaTol = this.computeXYAreaTolerance(range);
-        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_30__.CurveCurve.allIntersectionsAmongPrimitivesXY(primitivesB);
-        const graph = _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_12__.PlanarSubdivision.assembleHalfEdgeGraph(primitivesB, intersections);
+    static constructAllXYRegionLoops(curvesAndRegions, tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance) {
+        const primitives = RegionOps.collectCurvePrimitives(curvesAndRegions, undefined, true, true);
+        const range = this.curveArrayRange(primitives);
+        const areaTol = this.computeXYAreaTolerance(range, tolerance);
+        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_30__.CurveCurve.allIntersectionsAmongPrimitivesXY(primitives, tolerance);
+        const graph = _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_12__.PlanarSubdivision.assembleHalfEdgeGraph(primitives, intersections, tolerance);
         return _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_12__.PlanarSubdivision.collectSignedLoopSetsInHalfEdgeGraph(graph, areaTol);
     }
     /**
@@ -190210,7 +190408,7 @@ class RegionBooleanContext {
         }
         //    const range = RegionOps.curveArrayRange(allPrimitives);
         const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_15__.CurveCurve.allIntersectionsAmongPrimitivesXY(allPrimitives, mergeTolerance);
-        const graph = _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_16__.PlanarSubdivision.assembleHalfEdgeGraph(allPrimitives, intersections);
+        const graph = _Query_PlanarSubdivision__WEBPACK_IMPORTED_MODULE_16__.PlanarSubdivision.assembleHalfEdgeGraph(allPrimitives, intersections, mergeTolerance);
         this.graph = graph;
         this.faceAreaFunction = faceAreaFromCurvedEdgeData;
     }
@@ -197309,15 +197507,20 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "CoincidentGeometryQuery": () => (/* binding */ CoincidentGeometryQuery)
 /* harmony export */ });
-/* harmony import */ var _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../curve/CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
-/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
-/* harmony import */ var _AngleSweep__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
-/* harmony import */ var _Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
-/* harmony import */ var _Segment1d__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../curve/CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
+/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
+/* harmony import */ var _AngleSweep__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
+/* harmony import */ var _Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
+/* harmony import */ var _Segment1d__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module CartesianGeometry
+ */
+
 
 
 
@@ -197333,10 +197536,10 @@ class CoincidentGeometryQuery {
     get tolerance() {
         return this._tolerance;
     }
-    constructor(tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallMetricDistance) {
+    constructor(tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.smallMetricDistance) {
         this._tolerance = tolerance;
     }
-    static create(tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallMetricDistance) {
+    static create(tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.smallMetricDistance) {
         return new CoincidentGeometryQuery(tolerance);
     }
     /**
@@ -197359,12 +197562,12 @@ class CoincidentGeometryQuery {
      *
      */
     projectPointToSegmentXY(spacePoint, pointA, pointB) {
-        this._vectorU = _Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.createStartEnd(pointA, pointB, this._vectorU);
-        this._vectorV = _Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.createStartEnd(pointA, spacePoint, this._vectorV);
+        this._vectorU = _Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.createStartEnd(pointA, pointB, this._vectorU);
+        this._vectorV = _Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.createStartEnd(pointA, spacePoint, this._vectorV);
         const uDotU = this._vectorU.dotProductXY(this._vectorU);
         const uDotV = this._vectorU.dotProductXY(this._vectorV);
-        const fraction = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.safeDivideFraction(uDotV, uDotU, 0.0);
-        return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetail.createCurveFractionPoint(undefined, fraction, pointA.interpolate(fraction, pointB));
+        const fraction = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.safeDivideFraction(uDotV, uDotU, 0.0);
+        return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetail.createCurveFractionPoint(undefined, fraction, pointA.interpolate(fraction, pointB));
     }
     /**
      * * project `pointA0` and `pointA1` onto the segment with `pointB0` and `pointB1`
@@ -197375,84 +197578,82 @@ class CoincidentGeometryQuery {
      * @param pointB1 end point of segment B
      */
     coincidentSegmentRangeXY(pointA0, pointA1, pointB0, pointB1, restrictToBounds = true) {
-        const detailAOnB = this.projectPointToSegmentXY(pointA0, pointB0, pointB1);
-        if (pointA0.distanceXY(detailAOnB.point) > this._tolerance)
+        const detailA0OnB = this.projectPointToSegmentXY(pointA0, pointB0, pointB1);
+        if (pointA0.distanceXY(detailA0OnB.point) > this._tolerance)
             return undefined;
         const detailA1OnB = this.projectPointToSegmentXY(pointA1, pointB0, pointB1);
         if (pointA1.distanceXY(detailA1OnB.point) > this._tolerance)
             return undefined;
-        const detailBOnA = this.projectPointToSegmentXY(pointB0, pointA0, pointA1);
-        if (pointB0.distanceXY(detailBOnA.point) > this._tolerance)
+        const detailB0OnA = this.projectPointToSegmentXY(pointB0, pointA0, pointA1);
+        if (pointB0.distanceXY(detailB0OnA.point) > this._tolerance)
             return undefined;
         const detailB1OnA = this.projectPointToSegmentXY(pointB1, pointA0, pointA1);
         if (pointB1.distanceXY(detailB1OnA.point) > this._tolerance)
             return undefined;
-        detailAOnB.fraction1 = detailA1OnB.fraction;
-        detailAOnB.point1 = detailA1OnB.point; // capture -- detailB0OnA is not reused.
-        detailBOnA.fraction1 = detailB1OnA.fraction;
-        detailBOnA.point1 = detailB1OnA.point;
+        detailA0OnB.fraction1 = detailA1OnB.fraction;
+        detailA0OnB.point1 = detailA1OnB.point; // capture -- detailA1OnB is not reused.
+        detailB0OnA.fraction1 = detailB1OnA.fraction;
+        detailB0OnA.point1 = detailB1OnA.point;
         if (!restrictToBounds)
-            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
-        const segment = _Segment1d__WEBPACK_IMPORTED_MODULE_3__.Segment1d.create(detailBOnA.fraction, detailBOnA.fraction1);
+            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
+        const segment = _Segment1d__WEBPACK_IMPORTED_MODULE_4__.Segment1d.create(detailB0OnA.fraction, detailB0OnA.fraction1);
         if (segment.clampDirectedTo01()) {
-            segment.reverseIfNeededForDeltaSign(1.0);
             const f0 = segment.x0;
             const f1 = segment.x1;
-            const h0 = detailBOnA.inverseInterpolateFraction(f0);
-            const h1 = detailBOnA.inverseInterpolateFraction(f1);
+            const h0 = detailB0OnA.inverseInterpolateFraction(f0);
+            const h1 = detailB0OnA.inverseInterpolateFraction(f1);
             // recompute fractions and points..
-            CoincidentGeometryQuery.assignDetailInterpolatedFractionsAndPoints(detailBOnA, f0, f1, pointA0, pointA1);
-            CoincidentGeometryQuery.assignDetailInterpolatedFractionsAndPoints(detailAOnB, h0, h1, pointB0, pointB1);
-            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
+            CoincidentGeometryQuery.assignDetailInterpolatedFractionsAndPoints(detailB0OnA, f0, f1, pointA0, pointA1, f0 > f1);
+            CoincidentGeometryQuery.assignDetailInterpolatedFractionsAndPoints(detailA0OnB, h0, h1, pointB0, pointB1, h0 > h1);
+            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
         }
         else {
             if (segment.signedDelta() < 0.0) {
-                if (detailBOnA.point.isAlmostEqual(pointA0)) {
-                    detailBOnA.collapseToStart();
-                    detailAOnB.collapseToStart();
-                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
+                if (detailB0OnA.point.isAlmostEqual(pointA0, this.tolerance)) {
+                    detailB0OnA.collapseToStart();
+                    detailA0OnB.collapseToStart();
+                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
                 }
-                if (detailBOnA.point1.isAlmostEqual(pointA1)) {
-                    detailBOnA.collapseToEnd();
-                    detailAOnB.collapseToEnd();
-                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
+                if (detailB0OnA.point1.isAlmostEqual(pointA1, this.tolerance)) {
+                    detailB0OnA.collapseToEnd();
+                    detailA0OnB.collapseToEnd();
+                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
                 }
             }
             else {
-                if (detailBOnA.point.isAlmostEqual(pointA1)) {
-                    detailBOnA.collapseToStart();
-                    detailAOnB.collapseToEnd();
-                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
+                if (detailB0OnA.point.isAlmostEqual(pointA1, this.tolerance)) {
+                    detailB0OnA.collapseToStart();
+                    detailA0OnB.collapseToEnd();
+                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
                 }
-                if (detailBOnA.point1.isAlmostEqual(pointA0)) {
-                    detailBOnA.collapseToEnd();
-                    detailAOnB.collapseToStart();
-                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailBOnA, detailAOnB);
+                if (detailB0OnA.point1.isAlmostEqual(pointA0, this.tolerance)) {
+                    detailB0OnA.collapseToEnd();
+                    detailA0OnB.collapseToStart();
+                    return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailB0OnA, detailA0OnB);
                 }
             }
         }
         return undefined;
     }
     /**
-     * Create a CurveLocationDetailPair from . . .
+     * Create a CurveLocationDetailPair for a coincident interval of two overlapping curves
      * @param cpA curveA
-     * @param cpB curve B
-     * @param fractionsOnA fractions of an active section of curveA
-     * @param fractionB0 fraction of an original containing B interval
-     * @param fractionB1 end fraction of an original containing B interval
+     * @param cpB curveB
+     * @param fractionsOnA coincident interval of curveB in fraction space of curveA
+     * @param fractionB0 curveB start in fraction space of curveA
+     * @param fractionB1 curveB end in fraction space of curveA
+     * @param reverse whether curveB and curveA have opposite direction
      */
     createDetailPair(cpA, cpB, fractionsOnA, fractionB0, fractionB1, reverse) {
         const deltaB = fractionB1 - fractionB0;
-        const g0 = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.conditionalDivideFraction(fractionsOnA.x0 - fractionB0, deltaB);
-        const g1 = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.conditionalDivideFraction(fractionsOnA.x1 - fractionB0, deltaB);
+        const g0 = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.conditionalDivideFraction(fractionsOnA.x0 - fractionB0, deltaB);
+        const g1 = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.conditionalDivideFraction(fractionsOnA.x1 - fractionB0, deltaB);
         if (g0 !== undefined && g1 !== undefined) {
-            const detailA = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetail.createCurveEvaluatedFractionFraction(cpA, fractionsOnA.x0, fractionsOnA.x1);
-            const detailB = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetail.createCurveEvaluatedFractionFraction(cpB, g0, g1);
-            if (reverse) {
+            const detailA = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetail.createCurveEvaluatedFractionFraction(cpA, fractionsOnA.x0, fractionsOnA.x1);
+            const detailB = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetail.createCurveEvaluatedFractionFraction(cpB, g0, g1);
+            if (reverse)
                 detailA.swapFractionsAndPoints();
-                detailB.swapFractionsAndPoints();
-            }
-            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_2__.CurveLocationDetailPair.createCapture(detailA, detailB);
+            return _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailA, detailB);
         }
         return undefined;
     }
@@ -197469,43 +197670,67 @@ class CoincidentGeometryQuery {
      * @param arcA
      * @param arcB
      * @param _restrictToBounds
-     * @return 0, 1, or 2 overlap intervals.
+     * @return 0, 1, or 2 overlap points/intervals
      */
     coincidentArcIntersectionXY(arcA, arcB, _restrictToBounds = true) {
         let result;
-        if (arcA.center.isAlmostEqual(arcB.center)) {
+        if (arcA.center.isAlmostEqual(arcB.center, this.tolerance)) {
             const matrixBToA = arcA.matrixRef.multiplyMatrixInverseMatrix(arcB.matrixRef);
             if (matrixBToA) {
                 const ux = matrixBToA.at(0, 0);
                 const uy = matrixBToA.at(1, 0);
                 const vx = matrixBToA.at(0, 1);
                 const vy = matrixBToA.at(1, 1);
-                const ru = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXY(ux, uy);
-                const rv = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXY(vx, vy);
-                const dot = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.dotProductXYXY(ux, uy, vx, vy);
-                const cross = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.crossProductXYXY(ux, uy, vx, vy);
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isAlmostEqualNumber(ru, 1.0)
-                    && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isAlmostEqualNumber(rv, 1.0)
-                    && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isAlmostEqualNumber(0, dot)) {
-                    const alphaB0Radians = Math.atan2(uy, ux); // angular position of arcB 0 point in A sweep
-                    const sweepDirection = cross > 0 ? 1.0 : -1.0; // 1 if arcB's parameter space sweeps forward, -1 if reverse
-                    const betaStartRadians = alphaB0Radians + sweepDirection * arcB.sweep.startRadians;
-                    const betaEndRadians = alphaB0Radians + sweepDirection * arcB.sweep.endRadians;
+                const ru = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.hypotenuseXY(ux, uy);
+                const rv = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.hypotenuseXY(vx, vy);
+                const dot = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.dotProductXYXY(ux, uy, vx, vy);
+                const cross = _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.crossProductXYXY(ux, uy, vx, vy);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isAlmostEqualNumber(ru, 1.0)
+                    && _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isAlmostEqualNumber(rv, 1.0)
+                    && _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isAlmostEqualNumber(0, dot)) {
+                    const alphaB0Radians = Math.atan2(uy, ux); // angular position of arcB 0 point in arcA sweep
+                    const sweepDirection = cross > 0 ? 1.0 : -1.0; // 1 if arcB parameter space sweeps in same direction as arcA, -1 if opposite
+                    const betaStartRadians = alphaB0Radians + sweepDirection * arcB.sweep.startRadians; // arcB start in arcA parameter space
+                    const betaEndRadians = alphaB0Radians + sweepDirection * arcB.sweep.endRadians; // arcB end in arcA parameter space
                     const fractionSpacesReversed = (sweepDirection * arcA.sweep.sweepRadians * arcB.sweep.sweepRadians) < 0;
-                    const sweepB = _AngleSweep__WEBPACK_IMPORTED_MODULE_4__.AngleSweep.createStartEndRadians(betaStartRadians, betaEndRadians);
+                    const sweepB = _AngleSweep__WEBPACK_IMPORTED_MODULE_5__.AngleSweep.createStartEndRadians(betaStartRadians, betaEndRadians);
                     const sweepA = arcA.sweep;
                     const fractionPeriodA = sweepA.fractionPeriod();
-                    const fractionB0 = sweepA.radiansToPositivePeriodicFraction(sweepB.startRadians);
-                    const fractionSweep = sweepB.sweepRadians / sweepA.sweepRadians;
-                    const fractionB1 = fractionB0 + fractionSweep;
-                    const fractionSweepB = _Segment1d__WEBPACK_IMPORTED_MODULE_3__.Segment1d.create(fractionB0, fractionB1);
-                    if (fractionSweepB.clampDirectedTo01())
-                        result = this.appendDetailPair(result, this.createDetailPair(arcA, arcB, fractionSweepB, fractionB0, fractionB1, fractionSpacesReversed));
-                    if (fractionB1 > fractionPeriodA) {
-                        const fractionSweepBWrap = _Segment1d__WEBPACK_IMPORTED_MODULE_3__.Segment1d.create(fractionB0 - fractionPeriodA, fractionB1 - fractionPeriodA);
-                        if (fractionSweepBWrap.clampDirectedTo01())
-                            result = this.appendDetailPair(result, this.createDetailPair(arcA, arcB, fractionSweepBWrap, fractionB0, fractionB1, fractionSpacesReversed));
-                    }
+                    const fractionB0 = sweepA.radiansToPositivePeriodicFraction(sweepB.startRadians); // arcB start in arcA fraction space
+                    (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(fractionB0 >= 0.0);
+                    const fractionSweep = sweepB.sweepRadians / sweepA.sweepRadians; // arcB sweep in arcA fraction space
+                    const fractionB1 = fractionB0 + fractionSweep; // arcB end in arcA fraction space
+                    const fractionSweepB = _Segment1d__WEBPACK_IMPORTED_MODULE_4__.Segment1d.create(fractionB0, fractionB1);
+                    /** lambda to add a coincident interval or isolated intersection, given inputs in arcA fraction space
+                     * @param arcBInArcAFractionSpace span of arcB in arcA fraction space. On return, clamped to [0,1] if nontrivial.
+                     * @param testStartOfArcA if no nontrivial coincident interval was found, look for an isolated intersection at the start (true) or end (false) of arcA
+                     * @returns whether a detail pair was appended to result
+                     */
+                    const appendCoincidentIntersection = (arcBInArcAFractionSpace, testStartOfArcA) => {
+                        const size = result ? result.length : 0;
+                        const arcBStart = arcBInArcAFractionSpace.x0;
+                        const arcBEnd = arcBInArcAFractionSpace.x1;
+                        if (arcBInArcAFractionSpace.clampDirectedTo01() && !_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSmallRelative(arcBInArcAFractionSpace.absoluteDelta())) {
+                            result = this.appendDetailPair(result, this.createDetailPair(arcA, arcB, arcBInArcAFractionSpace, arcBStart, arcBEnd, fractionSpacesReversed));
+                        }
+                        else { // test isolated intersection
+                            const testStartOfArcB = fractionSpacesReversed ? testStartOfArcA : !testStartOfArcA;
+                            const arcAPt = this._point0 = testStartOfArcA ? arcA.startPoint(this._point0) : arcA.endPoint(this._point0);
+                            const arcBPt = this._point1 = testStartOfArcB ? arcB.startPoint(this._point1) : arcB.endPoint(this._point1);
+                            if (arcAPt.isAlmostEqual(arcBPt, this.tolerance)) {
+                                const detailA = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetail.createCurveFractionPoint(arcA, testStartOfArcA ? 0 : 1, arcAPt);
+                                const detailB = _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetail.createCurveFractionPoint(arcB, testStartOfArcB ? 0 : 1, arcBPt);
+                                result = this.appendDetailPair(result, _curve_CurveLocationDetail__WEBPACK_IMPORTED_MODULE_3__.CurveLocationDetailPair.createCapture(detailA, detailB));
+                            }
+                        }
+                        return result !== undefined && result.length > size;
+                    };
+                    appendCoincidentIntersection(fractionSweepB, false); // compute overlap in strict interior, or at end of arcA
+                    // check overlap at start of arcA with a periodic shift of fractionSweepB
+                    if (fractionB1 >= fractionPeriodA)
+                        appendCoincidentIntersection(_Segment1d__WEBPACK_IMPORTED_MODULE_4__.Segment1d.create(fractionB0 - fractionPeriodA, fractionB1 - fractionPeriodA), true);
+                    else if (fractionB0 === 0.0)
+                        appendCoincidentIntersection(_Segment1d__WEBPACK_IMPORTED_MODULE_4__.Segment1d.create(fractionB0 + fractionPeriodA, fractionB1 + fractionPeriodA), true);
                 }
             }
         }
@@ -204391,7 +204616,7 @@ class Matrix3d {
      * almost independent and matrix is invertible).
      */
     conditionNumber() {
-        const determinant = this.determinant();
+        const determinant = Math.abs(this.determinant());
         const columnMagnitudeSum = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXYZ(this.coffs[0], this.coffs[3], this.coffs[6])
             + _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXYZ(this.coffs[1], this.coffs[4], this.coffs[7])
             + _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXYZ(this.coffs[2], this.coffs[5], this.coffs[8]);
@@ -249353,6 +249578,7 @@ class HalfEdgeGraphOps {
     }
 }
 /**
+ * Note: this class uses hardcoded micrometer coordinate/cluster tolerance throughout.
  * @internal
  */
 class HalfEdgeGraphMerge {
@@ -282312,7 +282538,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.0.0-dev.99","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-eslintrc -c \\"./node_modules/@itwin/eslint-plugin/dist/configs/extension-exports-config.js\\" \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^4.0.0-dev.99","@itwin/core-bentley":"workspace:^4.0.0-dev.99","@itwin/core-common":"workspace:^4.0.0-dev.99","@itwin/core-geometry":"workspace:^4.0.0-dev.99","@itwin/core-orbitgt":"workspace:^4.0.0-dev.99","@itwin/core-quantity":"workspace:^4.0.0-dev.99"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"^4.0.0-dev.33","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^8.2.2","@types/node":"^18.11.5","@types/sinon":"^9.0.0","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.1.2","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^8.36.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^9.0.2","source-map-loader":"^4.0.0","typescript":"~5.0.2","webpack":"^5.76.0"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/object-storage-azure":"^1.5.0","@itwin/cloud-agnostic-core":"^1.5.0","@itwin/object-storage-core":"^1.5.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0","reflect-metadata":"0.1.13"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"},"eslintConfig":{"plugins":["@itwin"],"extends":"plugin:@itwin/itwinjs-recommended","rules":{"@itwin/no-internal-barrel-imports":["error",{"required-barrel-modules":["./src/tile/internal.ts"]}],"@itwin/public-extension-exports":["error",{"releaseTags":["public","preview"],"outputApiFile":false}]},"overrides":[{"files":["*.test.ts","*.test.tsx","**/test/**/*.ts"],"rules":{"@itwin/no-internal-barrel-imports":"off"}}]}}');
+module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.0.0","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-eslintrc -c \\"./node_modules/@itwin/eslint-plugin/dist/configs/extension-exports-config.js\\" \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^4.0.0","@itwin/core-bentley":"workspace:^4.0.0","@itwin/core-common":"workspace:^4.0.0","@itwin/core-geometry":"workspace:^4.0.0","@itwin/core-orbitgt":"workspace:^4.0.0","@itwin/core-quantity":"workspace:^4.0.0"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"^4.0.0-dev.33","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^8.2.2","@types/node":"^18.11.5","@types/sinon":"^9.0.0","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.1.2","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^8.36.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^9.0.2","source-map-loader":"^4.0.0","typescript":"~5.0.2","webpack":"^5.76.0"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/object-storage-azure":"^1.5.0","@itwin/cloud-agnostic-core":"^1.5.0","@itwin/object-storage-core":"^1.5.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0","reflect-metadata":"0.1.13"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"},"eslintConfig":{"plugins":["@itwin"],"extends":"plugin:@itwin/itwinjs-recommended","rules":{"@itwin/no-internal-barrel-imports":["error",{"required-barrel-modules":["./src/tile/internal.ts"]}],"@itwin/public-extension-exports":["error",{"releaseTags":["public","preview"],"outputApiFile":false}]},"overrides":[{"files":["*.test.ts","*.test.tsx","**/test/**/*.ts"],"rules":{"@itwin/no-internal-barrel-imports":"off"}}]}}');
 
 /***/ })