@itwin/ecschema-rpcinterface-tests 4.7.0-dev.0 → 4.7.0-dev.11

package/lib/dist/bundled-tests.js

@@ -28230,6 +28230,8 @@ var ChangesetType;
     ChangesetType[ChangesetType["Regular"] = 0] = "Regular";
     /** changeset *does* contain schema changes. */
     ChangesetType[ChangesetType["Schema"] = 1] = "Schema";
+    /** Schema changeset pushed by iModel with SchemaSync enabled */
+    ChangesetType[ChangesetType["SchemaSync"] = 65] = "SchemaSync";
 })(ChangesetType || (ChangesetType = {}));
 
 
@@ -38377,7 +38379,8 @@ class QPoint2d {
         return pt;
     }
 }
-/** @public
+/**
+ * @public
  * @extensions
  */
 var QPoint2dBuffer;
@@ -44112,30 +44115,38 @@ __webpack_require__.r(__webpack_exports__);
 
 /**
  * Represents a formatted block of text positioned in 2d or 3d space.
- * [TextAnnotation2d]($backend) and [TextAnnotation3d]($backend) elements store a TextAnnotation from which their geometric representation is generated.
+ * [TextAnnotation2d]($backend) and [TextAnnotation3d]($backend) elements store a single TextAnnotation from which their geometric representation is generated.
+ * Other types of elements may store multiple TextAnnotations, positioned relative to one another.
+ * The annotation's position and orientation relative to the host element's [Placement]($common) is determined as follows:
+ * - First, the width and height of a box enclosing the contents of the [[textBlock]] must be computed using [computeTextBlockExtents]($backend). This yields a box with the top-left
+ * corner at (0, 0) and the bottom-right corner at (width, -height).
+ * - Then, an "anchor point" is computed based on the text box and the [[anchor]] property. For example, if the annotation is anchored at the center-left, the anchor point will be (width/2, -height).
+ * - The [[orientation]] is applied to rotate the box around the anchor point.
+ * - Finally, the [[offset]] is added to the anchor point to apply translation.
  * @see [produceTextAnnotationGeometry]($backend) to decompose the annotation into a set of geometric primitives suitable for use with [[GeometryStreamBuilder.appendTextBlock]].
  * @beta
- * @preview
- * @extensions
  */
 class TextAnnotation {
-    constructor(angles, textBlock, anchor) {
+    constructor(offset, angles, textBlock, anchor) {
+        this.offset = offset;
         this.orientation = angles;
         this.textBlock = textBlock;
         this.anchor = anchor;
     }
     /** Creates a new TextAnnotation. */
     static create(args) {
+        const offset = args?.offset ?? new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Point3d();
         const angles = args?.orientation ?? new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.YawPitchRollAngles();
         const textBlock = args?.textBlock ?? _TextBlock__WEBPACK_IMPORTED_MODULE_1__.TextBlock.createEmpty();
         const anchor = args?.anchor ?? { vertical: "top", horizontal: "left" };
-        return new TextAnnotation(angles, textBlock, anchor);
+        return new TextAnnotation(offset, angles, textBlock, anchor);
     }
     /**
      * Creates a new TextAnnotation instance from its JSON representation.
      */
     static fromJSON(props) {
         return TextAnnotation.create({
+            offset: props?.offset ? _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Point3d.fromJSON(props.offset) : undefined,
             orientation: props?.orientation ? _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.YawPitchRollAngles.fromJSON(props.orientation) : undefined,
             textBlock: props?.textBlock ? _TextBlock__WEBPACK_IMPORTED_MODULE_1__.TextBlock.create(props.textBlock) : undefined,
             anchor: props?.anchor ? { ...props.anchor } : undefined,
@@ -44149,6 +44160,9 @@ class TextAnnotation {
         // Even if the text block is empty, we want to record its style name and overrides, e.g.,
         // so the user can pick up where they left off editing it next time.
         props.textBlock = this.textBlock.toJSON();
+        if (!this.offset.isZero) {
+            props.offset = this.offset.toJSON();
+        }
         if (!this.orientation.isIdentity()) {
             props.orientation = this.orientation.toJSON();
         }
@@ -44157,32 +44171,41 @@ class TextAnnotation {
         }
         return props;
     }
-    /**
-     * @internal used by produceTextAnnotationGeometry; requires layoutRange computed by layoutTextBlock.
+    /** Compute the transform that positions and orients this annotation relative to its anchor point, based on the [[textBlock]]'s computed bounding box.
+     * The anchor point is computed as specified by this annotation's [[anchor]] setting. For example, if the text block is anchored
+     * at the bottom left, then the transform will be relative to the bottom-left corner of `textBlockExtents`.
+     * The text block will be rotated around the fixed anchor point according to [[orientation]], then the anchor point will be translated by [[offset]].
+     * @param textBlockDimensions The width and height of the bounding box containing the text block. You can compute this using [computeTextBlockExtents]($backend).
+     * @see [[computeAnchorPoint]] to compute the transform's anchor point.
      */
-    computeDocumentTransform(layoutRange) {
-        const origin = this.computeAnchorPoint(layoutRange);
+    computeTransform(textBlockDimensions) {
+        const anchorPt = this.computeAnchorPoint(textBlockDimensions);
         const matrix = this.orientation.toMatrix3d();
-        return _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Transform.createFixedPointAndMatrix(origin, matrix);
+        const rotation = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Transform.createFixedPointAndMatrix(anchorPt, matrix);
+        const translation = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Transform.createTranslation(this.offset);
+        return translation.multiplyTransformTransform(rotation, rotation);
     }
-    /** @internal */
-    computeAnchorPoint(layoutRange) {
+    /** Compute the anchor point of this annotation as specified by [[anchor]].
+     * @param textBlockDimensions The width and height of the bounding box containing the [[textBlock]]. You can compute this using [computeTextBlockExtents]($backend).
+     * @see [[computeTransform]] to compute the transform relative to the anchor point.
+     */
+    computeAnchorPoint(textBlockDimensions) {
         let x = 0;
         let y = 0;
         switch (this.anchor.horizontal) {
             case "center":
-                x += layoutRange.xLength() / 2;
+                x += textBlockDimensions.x / 2;
                 break;
             case "right":
-                x += layoutRange.xLength();
+                x += textBlockDimensions.x;
                 break;
         }
         switch (this.anchor.vertical) {
             case "middle":
-                y -= layoutRange.yLength() / 2;
+                y -= textBlockDimensions.y / 2;
                 break;
             case "bottom":
-                y -= layoutRange.yLength();
+                y -= textBlockDimensions.y;
                 break;
         }
         return new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Point3d(x, y, 0);
@@ -44190,7 +44213,8 @@ class TextAnnotation {
     /** Returns true if this annotation is logically equivalent to `other`. */
     equals(other) {
         return this.anchor.horizontal === other.anchor.horizontal && this.anchor.vertical === other.anchor.vertical
-            && this.orientation.isAlmostEqual(other.orientation) && this.textBlock.equals(other.textBlock);
+            && this.orientation.isAlmostEqual(other.orientation) && this.offset.isAlmostEqual(other.offset)
+            && this.textBlock.equals(other.textBlock);
     }
 }
 
@@ -44224,8 +44248,6 @@ __webpack_require__.r(__webpack_exports__);
 /** Abstract representation of any of the building blocks that make up a [[TextBlock]] document - namely [[Run]]s, [[Paragraph]]s, and [[TextBlock]] itself.
  * Each component can specify a [[TextStyle]] that formats its contents and optional [[styleOverrides]] to customize that formatting.
  * @beta
- * @preview
- * @extensions
  */
 class TextBlockComponent {
     /** @internal */
@@ -44295,8 +44317,6 @@ class TextBlockComponent {
  * multiple lines, but it will never contain different styling.
  * Use the `type` field to discriminate between the different kinds of runs.
  * @beta
- * @preview
- * @extensions
  */
 var Run;
 (function (Run) {
@@ -44314,8 +44334,6 @@ var Run;
 })(Run || (Run = {}));
 /** The most common type of [[Run]], containing a sequence of characters to be displayed using a single style.
  * @beta
- * @preview
- * @extensions
  */
 class TextRun extends TextBlockComponent {
     constructor(props) {
@@ -44350,8 +44368,6 @@ class TextRun extends TextBlockComponent {
 /** A [[Run]] containing a numeric ratio to be displayed as a numerator and denominator separated by a horizontal or diagonal bar.
  * @note The [[numerator]] and [[denominator]] are stored as strings. They are not technically required to contain a numeric representation.
  * @beta
- * @preview
- * @extensions
  */
 class FractionRun extends TextBlockComponent {
     constructor(props) {
@@ -44386,8 +44402,6 @@ class FractionRun extends TextBlockComponent {
 }
 /** A [[Run]] that represents the end of a line of text within a [[Paragraph]]. It contains no content of its own - it simply causes subsequent content to display on a new line.
  * @beta
- * @preview
- * @extensions
  */
 class LineBreakRun extends TextBlockComponent {
     constructor(props) {
@@ -44417,8 +44431,6 @@ class LineBreakRun extends TextBlockComponent {
 }
 /** A collection of [[Run]]s within a [[TextBlock]]. Each paragraph within a text block is laid out on a separate line.
  * @beta
- * @preview
- * @extensions
  */
 class Paragraph extends TextBlockComponent {
     constructor(props) {
@@ -44466,8 +44478,6 @@ class Paragraph extends TextBlockComponent {
  * No word-wrapping is applied to the document unless a [[width]] greater than zero is specified.
  * @see [[TextAnnotation]] to position a text block as an annotation in 2d or 3d space.
  * @beta
- * @preview
- * @extensions
  */
 class TextBlock extends TextBlockComponent {
     constructor(props) {
@@ -44590,8 +44600,6 @@ __webpack_require__.r(__webpack_exports__);
  * @note This is an immutable type. Use [[clone]] to create a modified copy.
  * @see [[TextStyleSettingsProps]] for documentation of each of the settings.
  * @beta
- * @preview
- * @extensions
  */
 class TextStyleSettings {
     constructor(props, defaults) {
@@ -44658,8 +44666,6 @@ Object.freeze(TextStyleSettings.defaults);
  * @see [[TextBlockComponent.styleName]] to define the text style for a component of a [[TextBlock]].
  * @note This is an immutable type. Use [[clone]] to create a modified copy.
  * @beta
- * @preview
- * @extensions
  */
 class TextStyle {
     constructor(name, settings) {
@@ -46784,10 +46790,8 @@ var ElementGeometry;
             return true;
         }
         /** Append a series of entries representing a [[TextBlock]] to the [[ElementGeometryDataEntry]] array.
-       * @beta
-       * @extensions
-       * @preview
-       */
+         * @beta
+         */
         appendTextBlock(block) {
             for (const entry of block.entries) {
                 let result;
@@ -53126,8 +53130,6 @@ class GeometryStreamBuilder {
     }
     /** Append a series of entries representing a [[TextBlock]] to the [[GeometryStreamProps]] array.
      * @beta
-     * @extensions
-     * @preview
      */
     appendTextBlock(block) {
         for (const entry of block.entries) {
@@ -55726,7 +55728,7 @@ class RpcInvocation {
             status: this.protocol.getCode(this.status),
             id: this.request.id,
             interfaceName: (typeof (this.operation) === "undefined") ? "" : this.operation.interfaceDefinition.interfaceName,
-            allowCompression: this.operation?.policy.allowResponseCompression || false,
+            allowCompression: this.operation ? this.operation.policy.allowResponseCompression : true,
         };
         this.transformResponseStatus(fulfillment, rawResult);
         try {
@@ -55827,9 +55829,8 @@ class RpcMarshaling {
     /** Serializes a value. */
     static serialize(protocol, value) {
         const serialized = RpcSerializedValue.create();
-        if (typeof (value) === "undefined") {
+        if (value === undefined)
             return serialized;
-        }
         marshalingTarget = serialized;
         chunkThreshold = protocol ? protocol.transferChunkThreshold : 0;
         serialized.objects = JSON.stringify(value, (_key, _value) => WireFormat.marshal(_key, _value));
@@ -55997,7 +55998,7 @@ class RpcOperationPolicy {
         /** Whether the IModelRpcProps in the operation parameter list is allowed to differ from the token in the request URL. */
         this.allowTokenMismatch = false;
         /** Whether to compress the operation response with one of the client's supported encodings. */
-        this.allowResponseCompression = false;
+        this.allowResponseCompression = true;
     }
 }
 /** An RPC operation descriptor.
@@ -57055,6 +57056,8 @@ class RpcRequest {
         return this.reject(new _IModelError__WEBPACK_IMPORTED_MODULE_1__.NoContentError());
     }
     handleNotFound(status, value) {
+        if (RpcRequest.notFoundHandlers.numberOfListeners === 0)
+            this.handleRejected(value);
         const response = _RpcMarshaling__WEBPACK_IMPORTED_MODULE_4__.RpcMarshaling.deserialize(this.protocol, value);
         this.setStatus(status);
         let resubmitted = false;
@@ -57062,8 +57065,8 @@ class RpcRequest {
             if (resubmitted)
                 throw new _IModelError__WEBPACK_IMPORTED_MODULE_1__.IModelError(_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BentleyStatus.ERROR, `Already resubmitted using this handler.`);
             resubmitted = true;
-            this.submit(); // eslint-disable-line @typescript-eslint/no-floating-promises
-        }, (reason) => this.reject(reason));
+            void this.submit();
+        }, (reason) => reason ? this.reject(reason) : this.handleRejected(value));
         return;
     }
     resolve(result) {
@@ -59021,13 +59024,13 @@ var CurrentImdlVersion;
      * front-end is not capable of reading the tile content. Otherwise, this front-end can read the tile content even if the header specifies a
      * greater minor version than CurrentVersion.Minor, although some data may be skipped.
      */
-    CurrentImdlVersion[CurrentImdlVersion["Major"] = 33] = "Major";
+    CurrentImdlVersion[CurrentImdlVersion["Major"] = 34] = "Major";
     /** The unsigned 16-bit minor version number. If the major version in the tile header is equal to CurrentVersion.Major, then this package can
      * read the tile content even if the minor version in the tile header is greater than this value, although some data may be skipped.
      */
     CurrentImdlVersion[CurrentImdlVersion["Minor"] = 0] = "Minor";
     /** The unsigned 32-bit version number derived from the 16-bit major and minor version numbers. */
-    CurrentImdlVersion[CurrentImdlVersion["Combined"] = 2162688] = "Combined";
+    CurrentImdlVersion[CurrentImdlVersion["Combined"] = 2228224] = "Combined";
 })(CurrentImdlVersion || (CurrentImdlVersion = {}));
 /** Header embedded at the beginning of binary tile data in iMdl format describing its contents.
  * @internal
@@ -59336,6 +59339,7 @@ var TileOptions;
             ignoreAreaPatterns: 0 !== (contentFlags & ContentFlags.IgnoreAreaPatterns),
             enableExternalTextures: 0 !== (contentFlags & ContentFlags.ExternalTextures),
             useProjectExtents: 0 !== (tree.flags & TreeFlags.UseProjectExtents),
+            expandProjectExtents: 0 !== (tree.flags & TreeFlags.ExpandProjectExtents),
             optimizeBRepProcessing: 0 !== (tree.flags & TreeFlags.OptimizeBRepProcessing),
             useLargerTiles: 0 !== (tree.flags & TreeFlags.UseLargerTiles),
             disableMagnification: false,
@@ -59479,6 +59483,7 @@ const defaultTileOptions = Object.freeze({
     ignoreAreaPatterns: false,
     enableExternalTextures: true,
     useProjectExtents: true,
+    expandProjectExtents: true,
     optimizeBRepProcessing: true,
     useLargerTiles: true,
     disableMagnification: false,
@@ -59578,6 +59583,7 @@ var TreeFlags;
     TreeFlags[TreeFlags["EnforceDisplayPriority"] = 2] = "EnforceDisplayPriority";
     TreeFlags[TreeFlags["OptimizeBRepProcessing"] = 4] = "OptimizeBRepProcessing";
     TreeFlags[TreeFlags["UseLargerTiles"] = 8] = "UseLargerTiles";
+    TreeFlags[TreeFlags["ExpandProjectExtents"] = 16] = "ExpandProjectExtents"; // If UseProjectExtents, round them up/down to nearest powers of ten.
 })(TreeFlags || (TreeFlags = {}));
 function animationIdToString(animationId) {
     return `A:${animationId}_`;
@@ -59592,6 +59598,8 @@ function iModelTileTreeIdToString(modelId, treeId, options) {
         flags |= TreeFlags.OptimizeBRepProcessing;
     if (options.useLargerTiles)
         flags |= TreeFlags.UseLargerTiles;
+    if (options.expandProjectExtents)
+        flags |= TreeFlags.ExpandProjectExtents;
     if (_FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.Primary === treeId.type) {
         if (undefined !== treeId.animationId)
             idStr = `${idStr}${animationIdToString(treeId.animationId)}`;
@@ -59604,8 +59612,11 @@ function iModelTileTreeIdToString(modelId, treeId, options) {
     else {
         const typeStr = _FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.PlanarClassifier === treeId.type ? "CP" : "C";
         idStr = `${idStr + typeStr}:${treeId.expansion.toFixed(6)}_`;
-        if (_FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.VolumeClassifier === treeId.type)
+        if (_FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.VolumeClassifier === treeId.type) {
+            // Volume classifiers always use the exact project extents.
             flags |= TreeFlags.UseProjectExtents;
+            flags &= ~TreeFlags.ExpandProjectExtents;
+        }
         if (undefined !== treeId.animationId)
             idStr = `${idStr}${animationIdToString(treeId.animationId)}`;
     }
@@ -69950,16 +69961,10 @@ exports.SchemaGraph = SchemaGraph;
 /*!**********************************************************************!*\
   !*** ../../core/ecschema-rpc/common/lib/cjs/ECSchemaRpcInterface.js ***!
   \**********************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ECSchemaRpcInterface = void 0;
 /*---------------------------------------------------------------------------------------------
@@ -70006,9 +70011,6 @@ exports.ECSchemaRpcInterface = ECSchemaRpcInterface;
 ECSchemaRpcInterface.version = "2.0.0";
 ECSchemaRpcInterface.interfaceName = "ECSchemaRpcInterface";
 ECSchemaRpcInterface.interfaceVersion = ECSchemaRpcInterface.version;
-__decorate([
-    core_common_1.RpcOperation.setPolicy({ allowResponseCompression: true })
-], ECSchemaRpcInterface.prototype, "getSchemaJSON", null);
 
 
 /***/ }),
@@ -76069,10 +76071,10 @@ class CheckpointConnection extends _IModelConnection__WEBPACK_IMPORTED_MODULE_4_
         super(props);
         this._reopenConnectionHandler = async (request, response, resubmit, reject) => {
             if (!response.hasOwnProperty("isIModelNotFoundResponse"))
-                return;
+                reject();
             const iModelRpcProps = request.parameters[0];
             if (this._fileKey !== iModelRpcProps.key)
-                return; // The handler is called for a different connection than this
+                reject(); // The handler is called for a different connection than this
             _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Logger.logTrace(loggerCategory, "Attempting to reopen connection", () => iModelRpcProps);
             try {
                 const openResponse = await CheckpointConnection.callOpen(iModelRpcProps, this.routingContext);
@@ -100927,7 +100929,6 @@ const extensionExports = {
     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,
-    FractionRun: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FractionRun,
     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,
@@ -100962,7 +100963,6 @@ const extensionExports = {
     InteractiveTool: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.InteractiveTool,
     IntersectDetail: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.IntersectDetail,
     KeyinParseError: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.KeyinParseError,
-    LineBreakRun: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.LineBreakRun,
     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,
@@ -100988,7 +100988,6 @@ const extensionExports = {
     OutputMessageAlert: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessageAlert,
     OutputMessagePriority: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessagePriority,
     OutputMessageType: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.OutputMessageType,
-    Paragraph: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Paragraph,
     ParseAndRunResult: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ParseAndRunResult,
     ParticleCollectionBuilder: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ParticleCollectionBuilder,
     PerModelCategoryVisibility: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.PerModelCategoryVisibility,
@@ -101016,7 +101015,6 @@ const extensionExports = {
     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,
-    Run: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Run,
     Scene: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.Scene,
     ScreenViewport: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.ScreenViewport,
     SectionDrawingModelState: _core_frontend__WEBPACK_IMPORTED_MODULE_1__.SectionDrawingModelState,
@@ -101045,12 +101043,6 @@ const extensionExports = {
     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,
-    TextAnnotation: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextAnnotation,
-    TextBlock: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextBlock,
-    TextBlockComponent: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextBlockComponent,
-    TextRun: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextRun,
-    TextStyle: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextStyle,
-    TextStyleSettings: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextStyleSettings,
     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,
@@ -146901,6 +146893,7 @@ class TileAdmin {
         this.alwaysSubdivideIncompleteTiles = options.alwaysSubdivideIncompleteTiles ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.alwaysSubdivideIncompleteTiles;
         this.maximumMajorTileFormatVersion = options.maximumMajorTileFormatVersion ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.maximumMajorTileFormatVersion;
         this.useProjectExtents = options.useProjectExtents ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.useProjectExtents;
+        this.expandProjectExtents = options.expandProjectExtents ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.expandProjectExtents;
         this.optimizeBRepProcessing = options.optimizeBRepProcessing ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.optimizeBRepProcessing;
         this.useLargerTiles = options.useLargerTiles ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.useLargerTiles;
         this.mobileRealityTileMinToleranceRatio = Math.max(options.mobileRealityTileMinToleranceRatio ?? 3.0, 1.0);
@@ -150807,7 +150800,13 @@ async function getCesiumTerrainProvider(opts) {
     }
     const tilingScheme = new _internal__WEBPACK_IMPORTED_MODULE_8__.GeographicTilingScheme();
     let tileAvailability;
-    if (undefined !== layers.available) {
+    // When collecting tiles, only the highest resolution tiles are downloaded.
+    // Because of that, the tile availability is often only populated by the
+    // "layer" metadata. (i.e. not from higher resolution tiles metadata).
+    // Unfortunately the "layer" metadata only cover the first 16 levels,
+    // preventing the geometry collector from accessing to higher resolution tiles.
+    // For now, the solution is to turn off tile availability check when collecting geometries.
+    if (undefined !== layers.available && !opts.produceGeometry) {
         const availableTiles = layers.available;
         tileAvailability = new _internal__WEBPACK_IMPORTED_MODULE_8__.TileAvailability(tilingScheme, availableTiles.length);
         for (let level = 0; level < layers.available.length; level++) {
@@ -156309,6 +156308,7 @@ class MapTreeSupplier {
             exaggeration: id.terrainExaggeration,
             wantNormals: id.wantNormals,
             dataSource: id.terrainDataSource,
+            produceGeometry: id.produceGeometry,
         };
         if (id.applyTerrain) {
             await _ApproximateTerrainHeights__WEBPACK_IMPORTED_MODULE_3__.ApproximateTerrainHeights.instance.initialize();
@@ -167305,6 +167305,17 @@ class ToolAdmin {
         if (!await _IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.tools.run(this.defaultToolId, this.defaultToolArgs))
             return this.startPrimitiveTool(undefined);
     }
+    /**
+     * Call from external events or immediate tools that may have invalidated the current primitive tool's state.
+     * Examples are undo, which may invalidate any references to elements, or an immediate tool that uses an edit command to write to the iModel,
+     * since immediate tools do not replace the active tool.
+     * The current primitive tool is expected to call installTool with a new instance, or exitTool to start the default tool.
+     * @note Should be called even if the primitive tool is currently suspended by a view tool or input collector.
+     */
+    async restartPrimitiveTool() {
+        if (undefined !== this._primitiveTool)
+            await this._primitiveTool.onRestartTool();
+    }
     setCursor(cursor) {
         if (undefined === this._saveCursor)
             _IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.viewManager.setViewCursor(cursor);
@@ -196548,17 +196559,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
 /* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
 /* harmony import */ var _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../geometry3d/GeometryHandler */ "../../core/geometry/lib/esm/geometry3d/GeometryHandler.js");
-/* harmony import */ var _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../geometry3d/GrowableFloat64Array */ "../../core/geometry/lib/esm/geometry3d/GrowableFloat64Array.js");
+/* harmony import */ var _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../geometry3d/GrowableFloat64Array */ "../../core/geometry/lib/esm/geometry3d/GrowableFloat64Array.js");
 /* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
 /* harmony import */ var _geometry3d_Range__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../geometry3d/Range */ "../../core/geometry/lib/esm/geometry3d/Range.js");
 /* harmony import */ var _numerics_Newton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../numerics/Newton */ "../../core/geometry/lib/esm/numerics/Newton.js");
-/* harmony import */ var _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../numerics/Polynomials */ "../../core/geometry/lib/esm/numerics/Polynomials.js");
+/* harmony import */ var _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../numerics/Polynomials */ "../../core/geometry/lib/esm/numerics/Polynomials.js");
 /* harmony import */ var _Arc3d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
 /* harmony import */ var _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../CurveChainWithDistanceIndex */ "../../core/geometry/lib/esm/curve/CurveChainWithDistanceIndex.js");
 /* harmony import */ var _CurveCollection__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.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_5__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
-/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -196888,6 +196899,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
      * Check different combination of fractions on curveA and curveB. If distance between points at 2 fractions
      * is less than maxDistance, record CurveLocationDetailPair which is the approach between the 2 points.
      * Optionally, record close approaches of one curve's points if they fall between the other curve's points.
+     * * If an input curve is a LineString3d, then the corresponding fractions must define a segment of the line string.
      * @param cpA curveA
      * @param fA0 fraction0 on curveA
      * @param fA1 fraction1 on curveA
@@ -196923,7 +196935,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
      */
     getPointCurveClosestApproachXYNewton(curveP, pointQ) {
         if (!(curveP instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_2__.Arc3d) && !(curveP instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_5__.LineSegment3d)) {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!!"getPointCurveClosestApproachXYNewton only supports Arc3d and LineSegment");
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!"getPointCurveClosestApproachXYNewton only supports Arc3d and LineSegment");
             return undefined;
         }
         const seeds = [0.2, 0.4, 0.6, 0.8]; // HEURISTIC: arcs have up to 4 perpendiculars; lines have only 1
@@ -196951,9 +196963,24 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
             return _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_4__.CurveLocationDetail.createCurveFractionPoint(curveP, minCurvePFraction, minPointP);
         return undefined;
     }
-    /** Find the closest approach between pointA and cpB. Add the approach if it's within fB0 and fB1. */
+    /**
+     * Find the closest approach between `pointA` and `cpB`. Add the approach if it's within `fB0` and `fB1`.
+     * * Does not test the endpoints of `cpB`.
+     * * The only types supported for `cpB` are Arc3d, LineSegment3d, and LineString3d.
+     * * If `cpB` is a LineString3d, then the interval `[fB0, fB1]` must correspond to a segment of the line string.
+    */
     testAndRecordProjection(cpA, fA, pointA, cpB, fB0, fB1, reversed) {
-        const detail = this.getPointCurveClosestApproachXYNewton(cpB, pointA);
+        let detail;
+        if (cpB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d) {
+            const segParamsB = cpB.globalFractionToSegmentIndexAndLocalFraction(fB0 <= fB1 ? fB0 : fB1);
+            const segIndexB = (segParamsB.fraction < 0.999999) ? segParamsB.index : segParamsB.index + 1;
+            const segmentB = cpB.getIndexedSegment(segIndexB);
+            if (segmentB && (detail = this.getPointCurveClosestApproachXYNewton(segmentB, pointA)))
+                _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.convertLocalToGlobalDetail(detail, segIndexB, cpB.numEdges(), cpB);
+        }
+        else {
+            detail = this.getPointCurveClosestApproachXYNewton(cpB, pointA);
+        }
         if (detail) {
             const fB = _Geometry__WEBPACK_IMPORTED_MODULE_3__.Geometry.restrictToInterval(detail.fraction, fB0, fB1);
             if (fB === detail.fraction) { // if fraction is within fB0 and fB1
@@ -197013,15 +197040,15 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         const alpha = _Geometry__WEBPACK_IMPORTED_MODULE_3__.Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.center, 1); //  det(A0, A1, C)
         const beta = _Geometry__WEBPACK_IMPORTED_MODULE_3__.Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.vector0, 0); // det(A0, A1, U)
         const gamma = _Geometry__WEBPACK_IMPORTED_MODULE_3__.Geometry.tripleProductXYW(pointA0Local, 1, pointA1Local, 1, data.vector90, 0); // det(A0, A1, V)
-        const cosines = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_7__.GrowableFloat64Array(2);
-        const sines = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_7__.GrowableFloat64Array(2);
-        const radians = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_7__.GrowableFloat64Array(2);
-        const numRoots = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_8__.AnalyticRoots.appendImplicitLineUnitCircleIntersections(// solve the equation
+        const cosines = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_8__.GrowableFloat64Array(2);
+        const sines = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_8__.GrowableFloat64Array(2);
+        const radians = new _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_8__.GrowableFloat64Array(2);
+        const numRoots = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_9__.AnalyticRoots.appendImplicitLineUnitCircleIntersections(// solve the equation
         alpha, beta, gamma, cosines, sines, radians);
         for (let i = 0; i < numRoots; i++) {
             const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(i), data.vector90, sines.atUncheckedIndex(i));
             const arcFraction = data.sweep.radiansToSignedPeriodicFraction(radians.atUncheckedIndex(i));
-            const lineFraction = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
+            const lineFraction = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_9__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
             // only add if the point is within the start and end fractions of both line segment and arc
             if (lineFraction !== undefined && this.acceptFraction(lineFraction) && this.acceptFraction(arcFraction)) {
                 this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
@@ -197041,7 +197068,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         for (const radians1 of [parallelRadians, parallelRadians + Math.PI]) {
             const arcPoint = data.center.plus2Scaled(data.vector0, Math.cos(radians1), data.vector90, Math.sin(radians1));
             const arcFraction = data.sweep.radiansToSignedPeriodicFraction(radians1);
-            const lineFraction = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
+            const lineFraction = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_9__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
             // only add if the point is within the start and end fractions of both line segment and arc
             if (lineFraction !== undefined && this.acceptFraction(lineFraction) && this.acceptFraction(arcFraction)) {
                 this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
@@ -197085,27 +197112,27 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
     }
     /** Low level dispatch of arc with (beziers of) a bspline curve */
     dispatchArcBsplineCurve3d(cpA, cpB, reversed) {
-        const ls = _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d.create();
+        const ls = _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.create();
         cpB.emitStrokes(ls);
         this.computeArcLineString(cpA, ls, reversed);
     }
     /** Low level dispatch of (beziers of) a bspline curve with (beziers of) a bspline curve */
     dispatchBSplineCurve3dBSplineCurve3d(bcurveA, bcurveB, reversed) {
-        const lsA = _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d.create();
+        const lsA = _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.create();
         bcurveA.emitStrokes(lsA);
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d.create();
+        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.create();
         bcurveB.emitStrokes(lsB);
         this.computeLineStringLineString(lsA, lsB, reversed);
     }
     /** Low level dispatch of linestring with (beziers of) a bspline curve */
     dispatchLineStringBSplineCurve(lsA, curveB, reversed) {
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d.create();
+        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.create();
         curveB.emitStrokes(lsB);
         this.computeLineStringLineString(lsA, lsB, reversed);
     }
     /** Low level dispatch of segment with (beziers of) a bspline curve */
     dispatchSegmentBsplineCurve(segA, curveB, reversed) {
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d.create();
+        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d.create();
         curveB.emitStrokes(lsB);
         this.computeSegmentLineString(segA, lsB, reversed);
     }
@@ -197165,7 +197192,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         if (!this._geometryB || !(this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_11__.CurveChainWithDistanceIndex))
             return;
         if (geomA instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_11__.CurveChainWithDistanceIndex) {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!!"call handleCurveChainWithDistanceIndex(geomA) instead");
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!"call handleCurveChainWithDistanceIndex(geomA) instead");
             return;
         }
         const index0 = this._results.length;
@@ -197183,7 +197210,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
             const segmentB = this._geometryB;
             this.dispatchSegmentSegment(segmentA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, segmentB, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, false);
         }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d) {
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d) {
             this.computeSegmentLineString(segmentA, this._geometryB, false);
         }
         else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_2__.Arc3d) {
@@ -197278,7 +197305,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
     }
     /** Double dispatch handler for strongly typed linestring. */
     handleLineString3d(lsA) {
-        if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d) {
+        if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d) {
             const lsB = this._geometryB;
             this.computeLineStringLineString(lsA, lsB, false);
         }
@@ -197304,7 +197331,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_5__.LineSegment3d) {
             this.dispatchSegmentArc(this._geometryB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, arc0, true);
         }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d) {
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d) {
             this.computeArcLineString(arc0, this._geometryB, false);
         }
         else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_2__.Arc3d) {
@@ -197326,7 +197353,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_5__.LineSegment3d) {
             this.dispatchSegmentBsplineCurve(this._geometryB, curve, true);
         }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_9__.LineString3d) {
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_7__.LineString3d) {
             this.dispatchLineStringBSplineCurve(this._geometryB, curve, true);
         }
         else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_2__.Arc3d) {
@@ -198115,7 +198142,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         if (!this._geometryB || !(this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_12__.CurveChainWithDistanceIndex))
             return;
         if (geomA instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_12__.CurveChainWithDistanceIndex) {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!!"call handleCurveChainWithDistanceIndex(geomA) instead");
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!"call handleCurveChainWithDistanceIndex(geomA) instead");
             return;
         }
         const index0 = this._results.length;
@@ -198903,7 +198930,7 @@ class CurveCurveIntersectXYZ extends _geometry3d_GeometryHandler__WEBPACK_IMPORT
         if (!this._geometryB || !(this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_8__.CurveChainWithDistanceIndex))
             return;
         if (geomA instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_8__.CurveChainWithDistanceIndex) {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!!"call handleCurveChainWithDistanceIndex(geomA) instead");
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!"call handleCurveChainWithDistanceIndex(geomA) instead");
             return;
         }
         const index0 = this._results.length;
@@ -214127,6 +214154,10 @@ class XY {
     get isAlmostZero() {
         return _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSmallMetricDistance(this.x) && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSmallMetricDistance(this.y);
     }
+    /** Return true if the x and y components are all exactly zero */
+    get isZero() {
+        return this.x === 0.0 && this.y === 0.0;
+    }
     /** Return the largest absolute value of any component */
     maxAbs() {
         return Math.max(Math.abs(this.x), Math.abs(this.y));
@@ -216280,10 +216311,10 @@ class Vector3d extends XYZ {
         return _Angle__WEBPACK_IMPORTED_MODULE_2__.Angle.createAtan2(this.crossProductXY(vectorB), this.dotProductXY(vectorB));
     }
     /**
-     * Return the angle in radians (not as strongly-typed Angle) from this vector to vectorB, measured
-     * in their containing plane whose normal lies in the same half-space as vectorW.
+     * Return the angle in radians (not as strongly-typed Angle) from `this` vector to `vectorB`, measured
+     * in their containing plane whose normal lies in the same half-space as `vectorW`.
      * * The returned angle is between `-Math.PI` and `Math.PI`.
-     * * If the cross product of this vector and vectorB lies on the same side of the plane as vectorW,
+     * * If the cross product of `this` vector and `vectorB` lies on the same side of the plane as `vectorW`,
      * this function returns `radiansTo(vectorB)`; otherwise, it returns `-radiansTo(vectorB)`.
      * * `vectorW` does not have to be perpendicular to the plane.
      * * Use `planarRadiansTo` to measure the angle between vectors that are projected to another plane.
@@ -216291,6 +216322,7 @@ class Vector3d extends XYZ {
      * @param vectorW determines the side of the plane in which the returned angle is measured
      */
     signedRadiansTo(vectorB, vectorW) {
+        // A.B = |A||B|cos(theta) and |AxB| = |A||B|sin(theta) so theta = arctan(|AxB|/A.B)
         const p = this.crossProduct(vectorB);
         const theta = Math.atan2(p.magnitude(), this.dotProduct(vectorB));
         if (vectorW.dotProduct(p) < 0.0)
@@ -216984,6 +217016,25 @@ class Point3dArray {
         }
         return result;
     }
+    /**
+     * Copy 3d points into a packed number array.
+     * @param data array of xyz
+     * @param result optional destination array.
+     * @return packed number array
+     */
+    static packToNumberArray(data, result) {
+        const numValues = 3 * data.length;
+        if (!result)
+            result = Array(numValues);
+        result.length = numValues;
+        let i = 0;
+        for (const p of data) {
+            result[i++] = p.x;
+            result[i++] = p.y;
+            result[i++] = p.z;
+        }
+        return result;
+    }
     /**
      * Compute the 8 weights of trilinear mapping
      * By appropriate choice of weights, this can be used for both point and derivative mappings.
@@ -232142,7 +232193,7 @@ var AuxChannelDataType;
  * @public
 */
 class AuxChannelData {
-    /** Construct a new [[AuxChannelData]] from input value and vertex values. */
+    /** Constructor. If `values` is a number array, it is captured.  */
     constructor(input, values) {
         this.input = input;
         if (values instanceof Float64Array) {
@@ -232174,7 +232225,7 @@ class AuxChannelData {
  * @public
 */
 class AuxChannel {
-    /** Create a [[AuxChannel]] */
+    /** Constructor with CAPTURED inputs. */
     constructor(data, dataType, name, inputName) {
         this.data = data;
         this.dataType = dataType;
@@ -232200,15 +232251,23 @@ class AuxChannel {
                 return false;
         return true;
     }
-    /** True if [[entriesPerValue]] is `1`. */
+    /** True if the data type is 1-dimensional. */
+    static isScalar(dataType) {
+        return dataType === AuxChannelDataType.Distance || dataType === AuxChannelDataType.Scalar;
+    }
+    /** True if the data stored in this AuxChannel is 1-dimensional. */
     get isScalar() {
-        return this.dataType === AuxChannelDataType.Distance || this.dataType === AuxChannelDataType.Scalar;
+        return AuxChannel.isScalar(this.dataType);
+    }
+    /** The dimension (1D or 3D) of each datum of an AuxChannel of the given type. */
+    static entriesPerValue(dataType) {
+        return this.isScalar(dataType) ? 1 : 3;
     }
-    /** The number of values in `data.values` per entry - 1 for scalar and distance types, 3 for normal and vector types. */
+    /** The dimension (1D or 3D) of each datum in the data arrays of this AuxChannel. */
     get entriesPerValue() {
-        return this.isScalar ? 1 : 3;
+        return AuxChannel.entriesPerValue(this.dataType);
     }
-    /** The number of entries in `data.values`. */
+    /** The number of data stored in each data array of this AuxChannel, equal to the length of the array divided by `entriesPerValue`. */
     get valueCount() {
         return 0 === this.data.length ? 0 : this.data[0].values.length / this.entriesPerValue;
     }
@@ -232238,16 +232297,20 @@ class AuxChannel {
         return result;
     }
 }
-/**  The `PolyfaceAuxData` structure contains one or more analytical data channels for each vertex of a [[Polyface]], allowing the polyface to be styled
+/**
+ * The `PolyfaceAuxData` structure contains one or more analytical data channels for each vertex of a [[Polyface]], allowing the polyface to be styled
  * using an [AnalysisStyle]($common).
- * Typically a polyface will contain only vertex data required for its basic display: the vertex position, normal
- * and possibly texture parameter. `PolyfaceAuxData` provides supplemental data that is generally computed
- * in an analysis program or other external data source. This can be scalar data used to either override the vertex colors through, or
- * XYZ data used to deform the mesh by adjusting the vertex positions and/or normals.
+ * Typically a polyface will contain only vertex data required for its basic display: vertex position, normal, texture parameter, color.
+ * `PolyfaceAuxData` provides supplemental per-vertex data that is generally computed in an analysis program or other external data source.
+ * This supplemental data can be either 1D (e.g., height, override color) or 3D (e.g., displacement vector, override normal); see [[AuxChannel.entriesPerValue]], [[AuxChannel.dataType]].
+ * All data channels are indexed by the same indices, which must have the same length and structure as the other Polyface indices.
+ * This means that if a facet's face loop is found at index range [i0,i1] in the Polyface vertex index array, then the same index range [i0,i1]
+ * locates the data for this facet in all the other Polyface index arrays, including the `PolyfaceAuxData` indices.
  * @see [[PolyfaceData.auxData]] to associate auxiliary data with a polyface.
  * @public
  */
 class PolyfaceAuxData {
+    /** Constructor with CAPTURED inputs. */
     constructor(channels, indices) {
         this.channels = channels;
         this.indices = indices;
@@ -233769,7 +233832,8 @@ class IndexedPolyfaceVisitor extends _PolyfaceData__WEBPACK_IMPORTED_MODULE_0__.
      * * Example: suppose `[6,7,8]` is the pointIndex array representing a triangle. First edge would be `6,7`. Second
      * edge is `7,8`. Third edge is `8,6`. To access `6` for the third edge, we have to go back to the start of array.
      * Therefore, it is useful to store `6` at the end of pointIndex array, i.e., `[6,7,8,6]` meaning `numWrap = 1`.
-     * * `numWrap = 2` is useful when vertex visit requires two adjacent vectors, e.g. for cross products.
+     * Continuing this example, `numWrap = 2` (i.e., `[6,7,8,6,7]`) is useful when each vertex visit requires the next
+     * two points, e.g., to form two adjacent vectors for a cross product.
      */
     setNumWrap(numWrap) {
         this._numWrap = numWrap;
@@ -234423,11 +234487,38 @@ class IndexedPolyface extends Polyface {
     cleanupOpenFacet() {
         this.data.trimAllIndexArrays(this.data.pointIndex.length);
     }
+    /**
+     * Validate (the tail of) the active index arrays: point, normal, param, color.
+     * @param index0 optional offset into the index arrays at which to start validating indices. Default 0.
+     * @param errors optional array appended with error message(s) if invalid indices are encountered
+     * @return whether the indices are valid
+     */
+    validateAllIndices(index0 = 0, errors) {
+        const numPointIndices = this.data.pointIndex.length;
+        const messages = errors ?? [];
+        if (this.data.normalIndex && this.data.normalIndex.length !== numPointIndices)
+            messages.push("normalIndex count must match pointIndex count");
+        if (this.data.paramIndex && this.data.paramIndex.length !== numPointIndices)
+            messages.push("paramIndex count must equal pointIndex count");
+        if (this.data.colorIndex && this.data.colorIndex.length !== numPointIndices)
+            messages.push("colorIndex count must equal pointIndex count");
+        if (this.data.edgeVisible.length !== numPointIndices)
+            messages.push("visibleIndex count must equal pointIndex count");
+        if (!Polyface.areIndicesValid(this.data.pointIndex, index0, numPointIndices, this.data.point, this.data.point ? this.data.point.length : 0))
+            messages.push("invalid point indices in the last facet");
+        if (!Polyface.areIndicesValid(this.data.normalIndex, index0, numPointIndices, this.data.normal, this.data.normal ? this.data.normal.length : 0))
+            messages.push("invalid normal indices in the last facet");
+        if (!Polyface.areIndicesValid(this.data.paramIndex, index0, numPointIndices, this.data.param, this.data.param ? this.data.param.length : 0))
+            messages.push("invalid param indices in the last facet");
+        if (!Polyface.areIndicesValid(this.data.colorIndex, index0, numPointIndices, this.data.color, this.data.color ? this.data.color.length : 0))
+            messages.push("invalid color indices in the last facet");
+        return 0 === messages.length;
+    }
     /**
      * Announce the end of construction of a facet.
      * * Optionally check for:
      *   * Same number of indices among all active index arrays -- point, normal, param, color
-     *   * All indices are within bounds of the respective data arrays.
+     *   * All indices for the latest facet are within bounds of the respective data arrays.
      * * In error cases, all index arrays are trimmed back to the size when previous facet was terminated.
      * * A return value of `undefined` is normal. Otherwise, a string array of error messages is returned.
      */
@@ -234441,22 +234532,7 @@ class IndexedPolyface extends Polyface {
             const messages = [];
             if (lengthB < lengthA + 2)
                 messages.push("Less than 3 indices in the last facet");
-            if (this.data.normalIndex && this.data.normalIndex.length !== lengthB)
-                messages.push("normalIndex count must match pointIndex count");
-            if (this.data.paramIndex && this.data.paramIndex.length !== lengthB)
-                messages.push("paramIndex count must equal pointIndex count");
-            if (this.data.colorIndex && this.data.colorIndex.length !== lengthB)
-                messages.push("colorIndex count must equal pointIndex count");
-            if (this.data.edgeVisible.length !== lengthB)
-                messages.push("visibleIndex count must equal pointIndex count");
-            if (!Polyface.areIndicesValid(this.data.pointIndex, lengthA, lengthB, this.data.point, this.data.point ? this.data.point.length : 0))
-                messages.push("invalid point indices in the last facet");
-            if (!Polyface.areIndicesValid(this.data.normalIndex, lengthA, lengthB, this.data.normal, this.data.normal ? this.data.normal.length : 0))
-                messages.push("invalid normal indices in the last facet");
-            if (!Polyface.areIndicesValid(this.data.paramIndex, lengthA, lengthB, this.data.param, this.data.param ? this.data.param.length : 0))
-                messages.push("invalid param indices in the last facet");
-            if (!Polyface.areIndicesValid(this.data.colorIndex, lengthA, lengthB, this.data.color, this.data.color ? this.data.color.length : 0))
-                messages.push("invalid color indices in the last facet");
+            this.validateAllIndices(lengthA, messages);
             if (messages.length > 0) {
                 this.data.trimAllIndexArrays(lengthA);
                 return messages;
@@ -237688,10 +237764,11 @@ class PolyfaceData {
     }
     /**
      * Compress the instance by equating duplicate data.
-     * * Search for duplicates within points, normals, params, and colors.
+     * * Search for duplicates within vertices, normals, params, and colors.
      * * Compress each data array.
      * * Revise all indexing for the relocated data.
-     * @param tolerance (optional) tolerance for clustering mesh vertices. Default is [[Geometry.smallMetricDistance]].
+     * * [[PolyfaceAuxData]] is compressed if and only if exactly one [[AuxChannelData]] is present.
+     * @param tolerance (optional) tolerance for clustering mesh vertices only. Default value, and the tolerance used to cluster all other data, is [[Geometry.smallMetricDistance]].
      */
     compress(tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_5__.Geometry.smallMetricDistance) {
         // more info can be found at geometry/internaldocs/Polyface.md
@@ -237714,6 +237791,20 @@ class PolyfaceData {
             this.color = packedColors.packedNumbers;
             packedColors.updateIndices(this.colorIndex);
         }
+        if (this.auxData && this.auxData.channels.length === 1 && this.auxData.channels[0].data.length === 1) {
+            const dataSize = this.auxData.channels[0].entriesPerValue;
+            if (1 === dataSize) {
+                const packedData = _numerics_ClusterableArray__WEBPACK_IMPORTED_MODULE_9__.ClusterableArray.clusterNumberArray(this.auxData.channels[0].data[0].values);
+                this.auxData.channels[0].data[0].values = packedData.packedNumbers;
+                packedData.updateIndices(this.auxData.indices);
+            }
+            else if (3 === dataSize) {
+                const blockedData = _geometry3d_GrowableXYZArray__WEBPACK_IMPORTED_MODULE_0__.GrowableXYZArray.create(this.auxData.channels[0].data[0].values);
+                const packedData = _numerics_ClusterableArray__WEBPACK_IMPORTED_MODULE_9__.ClusterableArray.clusterGrowablePoint3dArray(blockedData);
+                this.auxData.channels[0].data[0].values = _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_2__.NumberArray.create(packedData.growablePackedPoints.float64Data());
+                packedData.updateIndices(this.auxData.indices);
+            }
+        }
     }
     /**
      * Test if `facetStartIndex` is (minimally) valid.
@@ -237926,6 +238017,7 @@ __webpack_require__.r(__webpack_exports__);
  * @module Polyface
  */
 /* eslint-disable @typescript-eslint/naming-convention, no-empty */
+// cspell:word internaldocs
 
 
 
@@ -237968,8 +238060,7 @@ __webpack_require__.r(__webpack_exports__);
  * @public
  */
 class SweepLineStringToFacetsOptions {
-    /** constructor -- captures fully-checked parameters from static create method.
-    */
+    /** Constructor. Captures fully-checked parameters from static create method. */
     constructor(vectorToEye, sideAngle, assembleChains, collectOnForwardFacets, collectOnSideFacets, collectOnRearFacets) {
         this.vectorToEye = vectorToEye;
         this.sideAngle = sideAngle;
@@ -237978,20 +238069,27 @@ class SweepLineStringToFacetsOptions {
         this.collectOnSideFacets = collectOnSideFacets;
         this.collectOnRearFacets = collectOnRearFacets;
     }
-    /** Create an options structure.
-     * * Default vectorToEye is positive Z
-     * * Default sideAngle has radians value Geometry.smallAngleRadians
-     * * Default assembleChains is true
-     * * Default collectOnForwardFacets, collectOnSideFacets, collectOnRearFacets are all true.
+    /**
+     * Create an options structure.
+     * * Default `vectorToEye` is (0,0,1).
+     * * Default `sideAngle` is `Geometry.smallAngleRadians`.
+     * * Default `assembleChains` is `true`.
+     * * Default `collectOnForwardFacets`, `collectOnSideFacets`, `collectOnRearFacets` are all `true`.
      */
     static create(vectorToEye, sideAngle, assembleChains, collectOnForwardFacets, collectOnSideFacets, collectOnRearFacets) {
         return new SweepLineStringToFacetsOptions(vectorToEye === undefined ? _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.unitZ() : vectorToEye.clone(), sideAngle === undefined ? _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createRadians(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallAngleRadians) : sideAngle.clone(), _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.resolveValue(assembleChains, true), _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.resolveValue(collectOnForwardFacets, true), _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.resolveValue(collectOnSideFacets, true), _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.resolveValue(collectOnRearFacets, true));
     }
-    /** Return true if all outputs are requested */
-    get collectAll() { return this.collectOnForwardFacets === true && this.collectOnRearFacets === true && this.collectOnRearFacets === true; }
-    /** Decide if the instance flags accept this facet.
-     * * Facets whose facet normal have positive, zero, or negative dot product with the vectorToEye are forward, side, and rear.
-     * * Undefined facet normal returns false
+    /** Return `true` if all outputs are requested. */
+    get collectAll() {
+        return this.collectOnForwardFacets === true &&
+            this.collectOnSideFacets === true &&
+            this.collectOnRearFacets === true;
+    }
+    /**
+     * Decide if the instance collector flags accept a facet with the given normal.
+     * * A facet whose facet normal has a positive, zero, or negative dot product with `vectorToEye` is classified
+     * as forward, side, or rear, respectively.
+     * * `undefined` facet normal returns `false`.
     */
     collectFromThisFacetNormal(facetNormal) {
         if (facetNormal === undefined)
@@ -238005,22 +238103,27 @@ class SweepLineStringToFacetsOptions {
 /**
  * Options carrier for [[PolyfaceQuery.cloneOffset]].
  * * Default options are strongly recommended.
- * * The option most likely to be changed is chamferTurnAngle
+ * * The option most likely to be changed is `chamferAngleBetweenNormals`.
  * @public
  */
 class OffsetMeshOptions {
-    /** Constructor -- CAPTURE parameters ... */
-    constructor(smoothSingleAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(25), smoothAccumulatedAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(60), chamferTurnAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(90)) {
+    /** Constructor -- CAPTURE parameters. */
+    constructor(smoothSingleAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(25), smoothAccumulatedAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(60), chamferAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(90)) {
         this.smoothSingleAngleBetweenNormals = smoothSingleAngleBetweenNormals.clone();
         this.smoothAccumulatedAngleBetweenNormals = smoothAccumulatedAngleBetweenNormals.clone();
-        this.chamferAngleBetweenNormals = chamferTurnAngle.clone();
+        this.chamferAngleBetweenNormals = chamferAngleBetweenNormals.clone();
     }
-    /** construct and return an OffsetMeshOptions with given parameters.
+    /**
+     * Construct and return an `OffsetMeshOptions` with given parameters.
      * * Angles are forced to minimum values.
      * * Clones of the angles are given to the constructor.
-     * @param smoothSingleRadiansBetweenNormals an angle larger than this (between facets) is considered a sharp edge
-     * @param smoothAccumulatedAngleBetweenNormals angles that sum to this much may be consolidated for average normal
-     * @param chamferTurnAngleBetweenNormals when facets meet with larger angle, a chamfer edge may be added if the angle between facet normals is larger than this.
+     * @param smoothSingleRadiansBetweenNormals an angle larger than this (between facets) is considered a sharp edge.
+     * Default value is `25` degrees.
+     * @param smoothAccumulatedAngleBetweenNormals angles that sum to this much may be consolidated for average normal.
+     * Default value is `60` degrees.
+     * @param chamferTurnAngleBetweenNormals when facets meet and the turn angle (i.e., angle between facet normals)
+     * is larger than `chamferTurnAngleBetweenNormals`, a chamfer edge may be added to prevent offset mesh from having
+     * facets that extend out too far away from the source mesh. Default value is `120` degrees.
      */
     static create(smoothSingleAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(25), smoothAccumulatedAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(60), chamferTurnAngleBetweenNormals = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(120)) {
         const mySmoothSingleRadiansBetweenNormals = smoothSingleAngleBetweenNormals.clone();
@@ -238036,25 +238139,27 @@ class OffsetMeshOptions {
     }
 }
 /**
- * Enumeration of cases for retaining facets among duplicates
+ * Enumeration of cases for retaining facets among duplicates.
  * @public
  */
 var DuplicateFacetClusterSelector;
 (function (DuplicateFacetClusterSelector) {
-    /** retain none of the duplicates */
+    /** Retain none of the duplicates. */
     DuplicateFacetClusterSelector[DuplicateFacetClusterSelector["SelectNone"] = 0] = "SelectNone";
-    /** retain any one member among duplicates */
+    /** Retain any one member among duplicates. */
     DuplicateFacetClusterSelector[DuplicateFacetClusterSelector["SelectAny"] = 1] = "SelectAny";
-    /** retain all members among duplicates */
+    /** Retain all members among duplicates. */
     DuplicateFacetClusterSelector[DuplicateFacetClusterSelector["SelectAll"] = 2] = "SelectAll";
-    /** retain one from any cluster with an odd number of faces */
+    /** Retain one from any cluster with an odd number of faces. */
     DuplicateFacetClusterSelector[DuplicateFacetClusterSelector["SelectOneByParity"] = 3] = "SelectOneByParity";
 })(DuplicateFacetClusterSelector || (DuplicateFacetClusterSelector = {}));
-/** PolyfaceQuery is a static class whose methods implement queries on a polyface or polyface visitor provided as a parameter to each method.
+/**
+ * PolyfaceQuery is a static class whose methods implement queries on a `Polyface` or `PolyfaceVisitor` provided as a
+ * parameter to each method.
  * @public
  */
 class PolyfaceQuery {
-    /** copy the points from a visitor into a Linestring3d in a Loop object */
+    /** Copy the points from a visitor into a linestring loop. */
     static visitorToLoop(visitor) {
         const ls = _curve_LineString3d__WEBPACK_IMPORTED_MODULE_3__.LineString3d.createPoints(visitor.point.getPoint3dArray());
         return _curve_Loop__WEBPACK_IMPORTED_MODULE_4__.Loop.create(ls);
@@ -238069,11 +238174,15 @@ class PolyfaceQuery {
         }
         return result;
     }
-    /** Return the sum of all facet areas.
-     * @param vectorToEye compute sum of *signed* facet areas projected to a view plane perpendicular to this vector
-    */
+    /**
+     * Sum all facet areas.
+     * @param source polyface or visitor.
+     * @param vectorToEye compute sum of (signed) facet areas projected to a view plane perpendicular to `vectorToEye`.
+     * If `vectorToEye` is not provided, actual facet areas are calculated (without any projection).
+     * @returns the sum of all facet areas. Return 0 if `source` is `undefined`.
+     */
     static sumFacetAreas(source, vectorToEye) {
-        let s = 0;
+        let sum = 0;
         if (source !== undefined) {
             if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
                 return PolyfaceQuery.sumFacetAreas(source.createVisitor(1), vectorToEye);
@@ -238082,20 +238191,21 @@ class PolyfaceQuery {
                 unitVectorToEye = vectorToEye.normalize();
             source.reset();
             while (source.moveToNextFacet()) {
-                const scaledNormal = _geometry3d_PolygonOps__WEBPACK_IMPORTED_MODULE_7__.PolygonOps.areaNormal(source.point.getPoint3dArray());
-                s += unitVectorToEye ? scaledNormal.dotProduct(unitVectorToEye) : scaledNormal.magnitude();
+                const areaNormal = _geometry3d_PolygonOps__WEBPACK_IMPORTED_MODULE_7__.PolygonOps.areaNormal(source.point.getPoint3dArray());
+                sum += unitVectorToEye ? areaNormal.dotProduct(unitVectorToEye) : areaNormal.magnitude();
             }
         }
-        return s;
+        return sum;
     }
-    /** sum volumes of tetrahedra from origin to all facets.
-     * * if origin is omitted, the first point encountered (by the visitor) is used as origin.
+    /**
+     * Sum volumes of tetrahedra from origin to all facets.
+     * * If origin is `undefined`, the first point encountered (by the visitor) is used as origin.
      * * If the mesh is closed, this sum is the volume.
-     * * If the mesh is not closed, this sum is the volume of a mesh with various additional facets
-     * from the origin to facets.
-    */
+     * * If the mesh is not closed, this sum is the volume of a mesh with various additional facets from the origin
+     * to facets.
+     */
     static sumTetrahedralVolumes(source, origin) {
-        let s = 0;
+        let sum = 0;
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
             return PolyfaceQuery.sumTetrahedralVolumes(source.createVisitor(0), origin);
         let myOrigin = origin;
@@ -238110,17 +238220,18 @@ class PolyfaceQuery {
             for (let i = 1; i + 1 < source.point.length; i++) {
                 source.point.getPoint3dAtUncheckedPointIndex(i, targetA);
                 source.point.getPoint3dAtUncheckedPointIndex(i + 1, targetB);
-                s += myOrigin.tripleProductToPoints(facetOrigin, targetA, targetB);
+                sum += myOrigin.tripleProductToPoints(facetOrigin, targetA, targetB);
             }
         }
-        return s / 6.0;
+        return sum / 6.0;
     }
-    /** sum (signed) volumes between facets and a plane.
+    /**
+     * Sum (signed) volumes between facets and a plane.
      * Return a structure with multiple sums:
      * * volume = the sum of (signed) volumes between facets and the plane.
-     * * positiveAreaMomentData, negativeProjectedFacetAreaMoments = moment data with centroid, area, and second moments with respect to the centroid.
-     *
-    */
+     * * positiveProjectedFacetAreaMoments, negativeProjectedFacetAreaMoments = moment data with centroid, area, and second
+     * moments with respect to the centroid.
+     */
     static sumVolumeBetweenFacetsAndPlane(source, plane) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
             return PolyfaceQuery.sumVolumeBetweenFacetsAndPlane(source.createVisitor(0), plane);
@@ -238138,18 +238249,18 @@ class PolyfaceQuery {
         const singleFacetProducts = _geometry4d_Matrix4d__WEBPACK_IMPORTED_MODULE_9__.Matrix4d.createZero();
         const projectToPlane = plane.getProjectionToPlane();
         source.reset();
-        // For each facet ..
-        //   Form triangles from facet origin to each far edge.
-        //   Sum signed area and volume contributions
-        // each "projectedArea" contribution is twice the area of a triangle.
-        // each volume contribution is  3 times the actual volume -- (1/3) of the altitude sums was the centroid altitude.
+        // For each facet:
+        // - form triangles from facet origin to each far edge.
+        // - sum signed area and volume contributions.
+        // each projected area contribution is twice the area of a triangle.
+        // each volume contribution is 3 times the actual volume -- (1/3) of the altitude sums was the centroid altitude.
         while (source.moveToNextFacet()) {
             source.point.getPoint3dAtUncheckedPointIndex(0, facetOrigin);
             h0 = plane.altitude(facetOrigin);
             singleFacetArea = 0;
             // within a single facets, the singleFacetArea sum is accumulated with signs of individual triangles.
-            // For a non-convex facet, this can be a mixture of positive and negative areas.
-            // The absoluteProjectedAreaSum contribution is forced positive after the sum for the facet.
+            // for a non-convex facet, this can be a mixture of positive and negative areas.
+            // the absoluteProjectedAreaSum contribution is forced positive after the sum for the facet.
             for (let i = 1; i + 1 < source.point.length; i++) {
                 source.point.getPoint3dAtUncheckedPointIndex(i, targetA);
                 source.point.getPoint3dAtUncheckedPointIndex(i + 1, targetB);
@@ -238180,7 +238291,7 @@ class PolyfaceQuery {
             negativeProjectedFacetAreaMoments: negativeAreaMoments,
         };
     }
-    /** Return the inertia products [xx,xy,xz,xw, yw, etc] integrated over all all facets, as viewed from origin. */
+    /** Return the inertia products [xx,xy,xz,xw,yw, etc] integrated over all all facets as viewed from origin. */
     static sumFacetSecondAreaMomentProducts(source, origin) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
             return PolyfaceQuery.sumFacetSecondAreaMomentProducts(source.createVisitor(0), origin);
@@ -238191,7 +238302,7 @@ class PolyfaceQuery {
         }
         return products;
     }
-    /** Return the inertia products [xx,xy,xz,xw, yw, etc] integrated over all tetrahedral volumes from origin */
+    /** Return the inertia products [xx,xy,xz,xw,yw, etc] integrated over all tetrahedral volumes from origin. */
     static sumFacetSecondVolumeMomentProducts(source, origin) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
             return PolyfaceQuery.sumFacetSecondVolumeMomentProducts(source.createVisitor(0), origin);
@@ -238202,10 +238313,11 @@ class PolyfaceQuery {
         }
         return products;
     }
-    /** Compute area moments for the mesh. In the returned MomentData:
-     * * origin is the centroid.
-     * * localToWorldMap has the origin and principal directions
-     * * radiiOfGyration radii for rotation around the x,y,z axes.
+    /**
+     * Compute area moments for the mesh. In the returned `MomentData`:
+     * * `origin` is the centroid.
+     * * `localToWorldMap` has the origin and principal directions.
+     * * `radiiOfGyration` radii for rotation around the x,y,z axes.
      */
     static computePrincipalAreaMoments(source) {
         const origin = source.data.getPoint(0);
@@ -238214,12 +238326,13 @@ class PolyfaceQuery {
         const inertiaProducts = PolyfaceQuery.sumFacetSecondAreaMomentProducts(source, origin);
         return _geometry4d_MomentData__WEBPACK_IMPORTED_MODULE_8__.MomentData.inertiaProductsToPrincipalAxes(origin, inertiaProducts);
     }
-    /** Compute area moments for the mesh. In the returned MomentData:
-     * * origin is the centroid.
-     * * localToWorldMap has the origin and principal directions
-     * * radiiOfGyration radii for rotation around the x,y,z axes.
+    /**
+     * Compute area moments for the mesh. In the returned MomentData:
+     * * `origin` is the centroid.
+     * * `localToWorldMap` has the origin and principal directions.
+     * * `radiiOfGyration` radii for rotation around the x,y,z axes.
      * * The result is only valid if the mesh is closed.
-     * * There is no test for closure.  Use `PolyfaceQuery.isPolyfaceClosedByEdgePairing(polyface)` to test for closure.
+     * * There is no test for closure. Use `PolyfaceQuery.isPolyfaceClosedByEdgePairing(polyface)` to test for closure.
      */
     static computePrincipalVolumeMoments(source) {
         const origin = source.data.getPoint(0);
@@ -238228,8 +238341,10 @@ class PolyfaceQuery {
         const inertiaProducts = PolyfaceQuery.sumFacetSecondVolumeMomentProducts(source, origin);
         return _geometry4d_MomentData__WEBPACK_IMPORTED_MODULE_8__.MomentData.inertiaProductsToPrincipalAxes(origin, inertiaProducts);
     }
-    /** Determine whether all facets are convex.
-     * @param source mesh to examine
+    /**
+     * Determine whether all facets are convex.
+     * @param source polyface or visitor.
+     * @returns `true` if all facets are convex; `false` otherwise.
      */
     static areFacetsConvex(source) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
@@ -238245,56 +238360,50 @@ class PolyfaceQuery {
         return true;
     }
     /**
-     * Test for convex volume by dihedral angle tests on all edges.
-     * * This tests if all dihedral angles are positive.
-     * * In a closed solid, this is a strong test for overall convexity.
-     * * With `ignoreBoundaries` true, this may be a useful test when all the facets are in a single edge-connected component, such as a pyramid with no underside.
-     * * It is not a correct test if there are multiple, disjoint components.
-     *   * Take the above-mentioned pyramid with no underside.
-     *   * Within the same mesh, have a second pyramid placed to the side, still facing upward.
-     *   * The angles will pass the dihedral convexity test, but the composite thing surely is not convex.
-     * @param source mesh to examine
-     * @param ignoreBoundaries if true, ignore simple boundary edges, i.e. allow unclosed meshes.
-     * @returns true if the mesh is closed and has all dihedral angles (angle across edge) positive
+     * Compute a number summarizing the dihedral angles in the mesh.
+     * * A dihedral angle is the signed angle between adjacent facets' normals. This angle is positive when the cross
+     * product `normalA x normalB` has the same direction as facetA's traversal of the facets' shared edge.
+     * @param source mesh.
+     * @param ignoreBoundaries if `true` ignore simple boundary edges, i.e., allow unclosed meshes. Default is `false`.
+     * See [[isConvexByDihedralAngleCount]] for comments about passing true when there are multiple
+     * connected components.
+     * * Return `0` if all dihedral angles are zero (and `ignoreBoundaries === true`). The mesh is planar.
+     * * Otherwise, return `1` if all dihedral angles are non-negative. The mesh probably encloses a convex volume and
+     * has outward normals.
+     * * Otherwise, return `-1` if all dihedral angles are non-positive. The mesh probably encloses a convex volume and
+     * has inward normals.
+     * * Otherwise, return `-2`. Also return `-2` if a non-manifold condition was detected, or a facet normal could not
+     * be computed. A non-manifold condition is a positive-length edge adjacent to more than 2 facets or (if
+     * `ignoreBoundaries` is false) adjacent to exactly one facet.
      */
-    static isConvexByDihedralAngleCount(source, ignoreBoundaries = false) {
-        return this.dihedralAngleSummary(source, ignoreBoundaries) > 0;
-    }
-    /**
-    * Compute a number summarizing the dihedral angles in the mesh.
-    * @see [[isConvexByDihedralAngleCount]] for comments about ignoreBoundaries===true when there are multiple connected components.
-    * @param source mesh to examine
-    * @param ignoreBoundaries if true, ignore simple boundary edges, i.e. allow unclosed meshes.
-    * @returns a number summarizing the dihedral angles in the mesh.
-    *   * Return 1 if all angles are positive or planar.  The mesh is probably convex with outward normals.
-    *   * Return -1 if all angles are negative or planar.  The mesh is probably convex with inward normals.
-    *   * Return 0 if
-    *     * angles area mixed
-    *     * any edge has other than 1 incident facet or more than 2 incident facets.
-    *     * (but null edges are permitted -- These occur naturally at edges of quads at north or south pole)
-    */
     static dihedralAngleSummary(source, ignoreBoundaries = false) {
+        // more info can be found at geometry/internaldocs/Polyface.md
         const edges = new _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.IndexedEdgeMatcher();
         const visitor = source.createVisitor(1);
         visitor.reset();
+        // find centroid normals of all facets
         const centroidNormal = [];
         let normalCounter = 0;
         while (visitor.moveToNextFacet()) {
             const numEdges = visitor.pointCount - 1;
             const normal = _geometry3d_PolygonOps__WEBPACK_IMPORTED_MODULE_7__.PolygonOps.centroidAreaNormal(visitor.point);
             if (normal === undefined)
-                return 0;
+                return -2;
             centroidNormal.push(normal);
             for (let i = 0; i < numEdges; i++) {
                 edges.addEdge(visitor.clientPointIndex(i), visitor.clientPointIndex(i + 1), normalCounter);
             }
             normalCounter++;
         }
+        // find "manifold clusters" and "bad clusters"
+        // manifold clusters are edges adjacent to 2 facets
+        // bad clusters are edges adjacent to more than 2 facets or (if ignoreBoundaries is false) adjacent to 1 facet
         const badClusters = [];
         const manifoldClusters = [];
         edges.sortAndCollectClusters(manifoldClusters, ignoreBoundaries ? undefined : badClusters, undefined, badClusters);
         if (badClusters.length > 0)
-            return 0;
+            return -2;
+        // find angle between facet centroid normals (dihedral angles)
         let numPositive = 0;
         let numPlanar = 0;
         let numNegative = 0;
@@ -238302,8 +238411,7 @@ class PolyfaceQuery {
         for (const cluster of manifoldClusters) {
             const sideA = cluster[0];
             const sideB = cluster[1];
-            if (sideA instanceof _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.SortableEdge
-                && sideB instanceof _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.SortableEdge
+            if (sideA instanceof _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.SortableEdge && sideB instanceof _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.SortableEdge
                 && source.data.point.vectorIndexIndex(sideA.vertexIndexA, sideA.vertexIndexB, edgeVector)) {
                 const dihedralAngle = centroidNormal[sideA.facetIndex].direction.signedAngleTo(centroidNormal[sideB.facetIndex].direction, edgeVector);
                 if (dihedralAngle.isAlmostZero)
@@ -238314,26 +238422,40 @@ class PolyfaceQuery {
                     numNegative++;
             }
         }
+        // categorize the mesh
         if (numPositive > 0 && numNegative === 0)
             return 1;
         if (numNegative > 0 && numPositive === 0)
             return -1;
-        // problem case: if all edges have zero dihedral angle, record it as convex.
-        if (numPlanar > 0 && numPositive === 0 && numNegative === 0)
-            return 1;
-        return 0;
+        if (numPlanar > 0 && numPositive === 0 && numNegative === 0) // planar mesh
+            return 0;
+        return -2;
+    }
+    /**
+   * Test for convex volume by dihedral angle tests on all edges.
+   * * This tests if all dihedral angles of the mesh are positive.
+   * * In a closed solid, this is a strong test for overall mesh convexity with outward facing normals.
+   * * See [[dihedralAngleSummary]] for the definition of "dihedral angle".
+   * * With `ignoreBoundaries` true, this may be a useful test when all the facets are in a single edge-connected
+   * component, such as a pyramid with no underside.
+   * * It is not a correct test if there are multiple, disjoint components.
+   * * Take the above-mentioned pyramid with no underside.
+   * * Within the same mesh, have a second pyramid placed to the side, still facing upward.
+   * * The angles will pass the dihedral convexity test, but the composite thing surely is not convex.
+   * @param source mesh.
+   * @param ignoreBoundaries if `true` ignore simple boundary edges, i.e., allow unclosed meshes. Default is `false`.
+   * @returns true if all dihedral angles of the mesh are positive.
+   */
+    static isConvexByDihedralAngleCount(source, ignoreBoundaries = false) {
+        return this.dihedralAngleSummary(source, ignoreBoundaries) > 0;
     }
     /**
-     * Test if the facets in `source` occur in perfectly mated pairs, as is required for a closed manifold volume.
-     */
-    static isPolyfaceClosedByEdgePairing(source) {
-        return this.isPolyfaceManifold(source, false);
-    }
-    /** Test edges pairing in `source` mesh.
-     * * for `allowSimpleBoundaries === false` true return means this is a closed 2-manifold surface
-     * * for `allowSimpleBoundaries === true` true means this is a 2-manifold surface which may have boundary, but is still properly matched internally.
-     * * Any edge with 3 or more incident facets triggers `false` return.
-     * * Any edge with 2 incident facets in the same direction triggers a `false` return.
+     * Test edges pairing in `source` mesh.
+     * * For `allowSimpleBoundaries === false` true return means this is a closed 2-manifold surface.
+     * * For `allowSimpleBoundaries === true` true means this is a 2-manifold surface which may have boundary, but is
+     * still properly matched internally.
+     * * Any edge with 3 or more adjacent facets triggers `false` return.
+     * * Any edge with 2 adjacent facets in the same direction triggers a `false` return.
     */
     static isPolyfaceManifold(source, allowSimpleBoundaries = false) {
         const edges = new _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.IndexedEdgeMatcher();
@@ -238349,44 +238471,18 @@ class PolyfaceQuery {
         edges.sortAndCollectClusters(undefined, allowSimpleBoundaries ? undefined : badClusters, undefined, badClusters);
         return badClusters.length === 0;
     }
-    /**
-     * construct a CurveCollection containing boundary edges.
-     *   * each edge is a LineSegment3d
-     * @param source polyface or visitor
-     * @param includeTypical true to in include typical boundary edges with a single incident facet
-     * @param includeMismatch true to include edges with more than 2 incident facets
-     * @param includeNull true to include edges with identical start and end vertex indices.
-     */
-    static boundaryEdges(source, includeTypical = true, includeMismatch = true, includeNull = true) {
-        const result = new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_5__.BagOfCurves();
-        const announceEdge = (pointA, pointB, _indexA, _indexB, _readIndex) => {
-            result.tryAddChild(_curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_11__.LineSegment3d.create(pointA, pointB));
-        };
-        PolyfaceQuery.announceBoundaryEdges(source, announceEdge, includeTypical, includeMismatch, includeNull);
-        if (result.children.length === 0)
-            return undefined;
-        return result;
-    }
-    /**
-     * Collect boundary edges.
-     * * Return the edges as the simplest collection of chains of line segments.
-     * @param source facets
-     * @param includeTypical true to in include typical boundary edges with a single incident facet
-     * @param includeMismatch true to include edges with more than 2 incident facets
-     * @param includeNull true to include edges with identical start and end vertex indices.
-     */
-    static collectBoundaryEdges(source, includeTypical = true, includeMismatch = true, includeNull = true) {
-        const collector = new _curve_internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_12__.MultiChainCollector(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance, _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance);
-        PolyfaceQuery.announceBoundaryEdges(source, (ptA, ptB) => collector.captureCurve(_curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_11__.LineSegment3d.create(ptA, ptB)), includeTypical, includeMismatch, includeNull);
-        return collector.grabResult(true);
+    /** Test if the facets in `source` occur in perfectly mated pairs, as is required for a closed manifold volume. */
+    static isPolyfaceClosedByEdgePairing(source) {
+        return this.isPolyfaceManifold(source, false);
     }
     /**
      * Test if the facets in `source` occur in perfectly mated pairs, as is required for a closed manifold volume.
      * If not, extract the boundary edges as lines.
-     * @param source polyface or visitor
-     * @param announceEdge function to be called with each boundary edge. The announcement is start and end points, start and end indices, and facet index.
-     * @param includeTypical true to announce typical boundary edges with a single incident facet
-     * @param includeMismatch true to announce edges with more than 2 incident facets
+     * @param source polyface or visitor.
+     * @param announceEdge function to be called with each boundary edge. The announcement is start and end points,
+     * start and end indices, and facet index.
+     * @param includeTypical true to announce typical boundary edges with a single adjacent facet.
+     * @param includeMismatch true to announce edges with more than 2 adjacent facets.
      * @param includeNull true to announce edges with identical start and end vertex indices.
      */
     static announceBoundaryEdges(source, announceEdge, includeTypical = true, includeMismatch = true, includeNull = true) {
@@ -238402,17 +238498,17 @@ class PolyfaceQuery {
                 edges.addEdge(visitor.clientPointIndex(i), visitor.clientPointIndex(i + 1), visitor.currentReadIndex());
             }
         }
-        const bad1 = [];
-        const bad2 = [];
-        const bad0 = [];
-        edges.sortAndCollectClusters(undefined, bad1, bad0, bad2);
+        const boundaryEdges = [];
+        const nullEdges = [];
+        const allOtherEdges = [];
+        edges.sortAndCollectClusters(undefined, boundaryEdges, nullEdges, allOtherEdges);
         const badList = [];
-        if (includeTypical && bad1.length > 0)
-            badList.push(bad1);
-        if (includeMismatch && bad2.length > 0)
-            badList.push(bad2);
-        if (includeNull && bad0.length > 0)
-            badList.push(bad0);
+        if (includeTypical && boundaryEdges.length > 0)
+            badList.push(boundaryEdges);
+        if (includeNull && nullEdges.length > 0)
+            badList.push(nullEdges);
+        if (includeMismatch && allOtherEdges.length > 0)
+            badList.push(allOtherEdges);
         if (badList.length === 0)
             return undefined;
         const sourcePolyface = visitor.clientPolyface();
@@ -238429,12 +238525,61 @@ class PolyfaceQuery {
         }
     }
     /**
-     * Invoke the callback on each manifold edge whose adjacent facet normals form vectorToEye dot products with opposite sign.
+     * Construct a CurveCollection containing boundary edges.
+     * * Each edge is a LineSegment3d.
+     * @param source polyface or visitor.
+     * @param includeTypical true to in include typical boundary edges with a single adjacent facet.
+     * @param includeMismatch true to include edges with more than 2 adjacent facets.
+     * @param includeNull true to include edges with identical start and end vertex indices.
+     */
+    static boundaryEdges(source, includeTypical = true, includeMismatch = true, includeNull = true) {
+        const result = new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_5__.BagOfCurves();
+        const announceEdge = (pointA, pointB, _indexA, _indexB, _readIndex) => {
+            result.tryAddChild(_curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_11__.LineSegment3d.create(pointA, pointB));
+        };
+        PolyfaceQuery.announceBoundaryEdges(source, announceEdge, includeTypical, includeMismatch, includeNull);
+        if (result.children.length === 0)
+            return undefined;
+        return result;
+    }
+    /**
+     * Collect boundary edges.
+     * * Return the edges as the simplest collection of chains of line segments.
+     * @param source polyface or visitor.
+     * @param includeTypical true to in include typical boundary edges with a single adjacent facet.
+     * @param includeMismatch true to include edges with more than 2 adjacent facets.
+     * @param includeNull true to include edges with identical start and end vertex indices.
+     */
+    static collectBoundaryEdges(source, includeTypical = true, includeMismatch = true, includeNull = true) {
+        const collector = new _curve_internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_12__.MultiChainCollector(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance, _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance);
+        PolyfaceQuery.announceBoundaryEdges(source, (ptA, ptB) => collector.captureCurve(_curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_11__.LineSegment3d.create(ptA, ptB)), includeTypical, includeMismatch, includeNull);
+        return collector.grabResult(true);
+    }
+    /**
+     * Load all half edges from a mesh to an IndexedEdgeMatcher.
+     * @param polyface a mesh or a visitor assumed to have numWrap === 1.
+    */
+    static createIndexedEdges(polyface) {
+        if (polyface instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
+            return this.createIndexedEdges(polyface.createVisitor(1));
+        const edges = new _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.IndexedEdgeMatcher();
+        polyface.reset();
+        while (polyface.moveToNextFacet()) {
+            const numEdges = polyface.pointCount - 1;
+            for (let i = 0; i < numEdges; i++) {
+                edges.addEdge(polyface.clientPointIndex(i), polyface.clientPointIndex(i + 1), polyface.currentReadIndex());
+            }
+        }
+        return edges;
+    }
+    /**
+     * Invoke the callback on each manifold edge whose adjacent facet normals form vectorToEye dot products
+     * with opposite sign.
      * * The callback is not called on boundary edges.
-     * @param source facets
-     * @param announce callback function invoked on manifold silhouette edges
-     * @param vectorToEye normal of plane in which to compute silhouette edges
-     * @param sideAngle angular tolerance for perpendicularity test
+     * @param source polyface or visitor.
+     * @param announce callback function invoked on manifold silhouette edges.
+     * @param vectorToEye normal of plane in which to compute silhouette edges.
+     * @param sideAngle angular tolerance for perpendicularity test.
      */
     static announceSilhouetteEdges(source, announce, vectorToEye, sideAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createSmallAngle()) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
@@ -238484,16 +238629,17 @@ class PolyfaceQuery {
      * Collect manifold edges whose adjacent facet normals form vectorToEye dot products with opposite sign.
      * * Does not return boundary edges.
      * * Return the edges as chains of line segments.
-     * @param source facets
-     * @param vectorToEye normal of plane in which to compute silhouette edges
-     * @param sideAngle angular tolerance for perpendicularity test
+     * @param source polyface or visitor.
+     * @param vectorToEye normal of plane in which to compute silhouette edges.
+     * @param sideAngle angular tolerance for perpendicularity test.
      */
     static collectSilhouetteEdges(source, vectorToEye, sideAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createSmallAngle()) {
         const collector = new _curve_internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_12__.MultiChainCollector(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance, _Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance);
         PolyfaceQuery.announceSilhouetteEdges(source, (ptA, ptB) => collector.captureCurve(_curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_11__.LineSegment3d.create(ptA, ptB)), vectorToEye, sideAngle);
         return collector.grabResult(true);
     }
-    /** Find segments (within the linestring) which project to facets.
+    /**
+     * Find segments (within the linestring) which project to facets.
      * * Announce each pair of linestring segment and on-facet segment through a callback.
      * * Facets are ASSUMED to be convex and planar, and not overlap in the z direction.
      */
@@ -238506,7 +238652,24 @@ class PolyfaceQuery {
             }
         }
     }
-    /** Execute context.projectToPolygon until its work estimates accumulate to workLimit  */
+    /**
+     * Set the limit on work during an async time blocks, and return the old value.
+     * * This should be a large number -- default is 1.0e6
+     * @internal
+     */
+    static setAsyncWorkLimit(value) {
+        const oldValue = this._asyncWorkLimit;
+        this._asyncWorkLimit = value;
+        return oldValue;
+    }
+    /**
+     * Query the current limit on work during an async time block.
+     * @internal
+     */
+    static get asyncWorkLimit() {
+        return this._asyncWorkLimit;
+    }
+    /** Execute `context.projectToPolygon` until its work estimates accumulate to workLimit.  */
     static async continueAnnounceSweepLinestringToConvexPolyfaceXY(context, visitor, announce) {
         let workCount = 0;
         while ((workCount < this.asyncWorkLimit) && visitor.moveToNextFacet()) {
@@ -238514,16 +238677,8 @@ class PolyfaceQuery {
         }
         return workCount;
     }
-    /** Set the limit on work during an async time blocks, and return the old value.
-     * * This should be a large number -- default is 1.0e6
-     * @internal
-     */
-    static setAsyncWorkLimit(value) { const a = this._asyncWorkLimit; this._asyncWorkLimit = value; return a; }
-    /** Query the current limit on work during an async time block.
-     * @internal
-     */
-    static get asyncWorkLimit() { return this._asyncWorkLimit; }
-    /** Find segments (within the linestring) which project to facets.
+    /**
+     * Find segments (within the linestring) which project to facets.
      * * Announce each pair of linestring segment and on-facet segment through a callback.
      * * Facets are ASSUMED to be convex and planar, and not overlap in the z direction.
      * * REMARK: Although this is public, the usual use is via slightly higher level public methods, viz:
@@ -238546,14 +238701,15 @@ class PolyfaceQuery {
         // GeometryCoreTestIO.consoleLog({ myWorkTotal: workTotal, myBlockCount: this.awaitBlockCount });
         return workTotal;
     }
-    /** Search the facets for facet subsets that are connected with at least vertex contact.
+    /**
+     * Search the facets for facet subsets that are connected with at least vertex contact.
      * * Return array of arrays of facet indices.
      */
     static partitionFacetIndicesByVertexConnectedComponent(polyface) {
         if (polyface instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
             return this.partitionFacetIndicesByVertexConnectedComponent(polyface.createVisitor(0));
         }
-        // The polyface is really a visitor !!!
+        // The polyface is really a visitor
         const context = new _numerics_UnionFind__WEBPACK_IMPORTED_MODULE_14__.UnionFindContext(this.visitorClientPointCount(polyface));
         for (polyface.reset(); polyface.moveToNextFacet();) {
             const firstVertexIndexOnThisFacet = polyface.pointIndex[0];
@@ -238581,9 +238737,9 @@ class PolyfaceQuery {
     /**
      * * Examine the normal orientation for each faces.
      * * Separate to 3 partitions:
-     *    * facets with normal in the positive direction of the vectorToEye (partition 0)
-     *    * facets with normal in the negative direction of the vectorToEye (partition 1)
-     *    * facets nearly perpendicular to the view vector  (partition 2)
+     *    * Facets with normal in the positive direction of the vectorToEye (partition 0).
+     *    * Facets with normal in the negative direction of the vectorToEye (partition 1).
+     *    * Facets nearly perpendicular to the view vector  (partition 2).
      * * Return array of arrays of facet indices.
      */
     static partitionFacetIndicesByVisibilityVector(polyface, vectorToEye, sideAngleTolerance) {
@@ -238618,13 +238774,13 @@ class PolyfaceQuery {
     }
     /**
      * Return the boundary of facets that are facing the eye.
-     * @param polyface
+     * @param polyface the indexed polyface
      * @param visibilitySubset selector among the visible facet sets extracted by partitionFacetIndicesByVisibilityVector
      *   * 0 ==> forward facing
      *   * 1 ==> rear facing
      *   * 2 ==> side facing
-     * @param vectorToEye
-     * @param sideAngleTolerance
+     * @param vectorToEye the vector to eye
+     * @param sideAngleTolerance the tolerance of side angle
      */
     static boundaryOfVisibleSubset(polyface, visibilitySelect, vectorToEye, sideAngleTolerance = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createDegrees(1.0e-3)) {
         const partitionedIndices = this.partitionFacetIndicesByVisibilityVector(polyface, vectorToEye, sideAngleTolerance);
@@ -238634,10 +238790,9 @@ class PolyfaceQuery {
         return this.boundaryEdges(visitor, true, false, false);
     }
     /**
-     * Search for edges with only 1 incident facet.
-     * * chain them into loops
-     * * emit the loops to the announceLoop function
-     * @param mesh
+     * Search for edges with only 1 adjacent facet.
+     * * Chain them into loops.
+     * * Emit the loops to the announceLoop function.
      */
     static announceBoundaryChainsAsLineString3d(mesh, announceLoop) {
         const collector = new _curve_internalContexts_MultiChainCollector__WEBPACK_IMPORTED_MODULE_12__.MultiChainCollector(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance, 1000);
@@ -238648,9 +238803,9 @@ class PolyfaceQuery {
      * Return a mesh with
      *  * clusters of adjacent, coplanar facets merged into larger facets.
      *  * other facets included unchanged.
-     * @param mesh existing mesh or visitor
-     * @param maxSmoothEdgeAngle maximum dihedral angle across an edge between facets deemed coplanar. If undefined, uses `Geometry.smallAngleRadians`.
-     * @returns
+     * @param mesh existing mesh or visitor.
+     * @param maxSmoothEdgeAngle maximum dihedral angle across an edge between facets deemed coplanar. If undefined,
+     * uses `Geometry.smallAngleRadians`.
      */
     static cloneWithMaximalPlanarFacets(mesh, maxSmoothEdgeAngle) {
         if (mesh instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
@@ -238709,14 +238864,14 @@ class PolyfaceQuery {
      *  * Unclosed chains are rejected.
      *  * Closed chains are triangulated and returned as a mesh.
      *  * The options structure enforces restrictions on how complicated the hole filling can be:
-     *     * maxEdgesAroundHole -- holes with more edges are skipped
+     *     * maxEdgesAroundHole -- holes with more edges are skipped.
      *     * maxPerimeter -- holes with larger summed edge lengths are skipped.
      *     * upVector -- holes that do not have positive area along this view are skipped.
-     *     * includeOriginalMesh -- includes the original mesh in the output mesh, so the composite mesh is a clone with holes filled
-     * @param mesh existing mesh
+     *     * includeOriginalMesh -- includes the original mesh in the output mesh, so the composite mesh is a
+     * clone with holes filled.
+     * @param mesh existing mesh.
      * @param options options controlling the hole fill.
      * @param unfilledChains optional array to receive the points around holes that were not filled.
-     * @returns
      */
     static fillSimpleHoles(mesh, options, unfilledChains) {
         if (mesh instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
@@ -238752,9 +238907,7 @@ class PolyfaceQuery {
         }
         return builder.claimPolyface(true);
     }
-    /** Clone the facets in each partition to a separate polyface.
-   *
-   */
+    /** Clone the facets in each partition to a separate polyface. */
     static clonePartitions(polyface, partitions) {
         if (polyface instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
             return this.clonePartitions(polyface.createVisitor(0), partitions);
@@ -238777,7 +238930,7 @@ class PolyfaceQuery {
         }
         return polyfaces;
     }
-    /** Clone facets that pass a filter function */
+    /** Clone facets that pass a filter function. */
     static cloneFiltered(source, filter) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
             return this.cloneFiltered(source.createVisitor(0), filter);
@@ -238847,46 +239000,44 @@ class PolyfaceQuery {
         }
         return builder.claimPolyface(true);
     }
-    /** If the visitor's client is a polyface, simply return its point array length.
-     * If not a polyface, visit all facets to find the largest index.
-     */
-    static visitorClientPointCount(visitor) {
-        if (visitor instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
-            return visitor.data.point.length;
-        const polyface = visitor.clientPolyface();
+    /** Return the point count of the `source`. */
+    static visitorClientPointCount(source) {
+        if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
+            return source.data.point.length;
+        const polyface = source.clientPolyface();
         if (polyface !== undefined)
             return polyface.data.point.length;
-        visitor.reset();
+        source.reset();
         let maxIndex = -1;
-        while (visitor.moveToNextFacet()) {
-            for (const pointIndex of visitor.pointIndex)
+        while (source.moveToNextFacet()) {
+            for (const pointIndex of source.pointIndex)
                 if (pointIndex > maxIndex)
                     maxIndex = pointIndex;
         }
         return maxIndex + 1;
     }
-    /** If the visitor's client is a polyface, simply return its facet count.
-     * If not a polyface, visit all facets to accumulate a count.
-     */
-    static visitorClientFacetCount(visitor) {
-        if (visitor instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
-            if (visitor.facetCount !== undefined)
-                return visitor.facetCount;
-            visitor = visitor.createVisitor(0);
+    /** Return the facet count of the `source`. */
+    static visitorClientFacetCount(source) {
+        if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
+            if (source.facetCount !== undefined)
+                return source.facetCount;
+            source = source.createVisitor(0);
         }
-        const polyface = visitor.clientPolyface();
+        const polyface = source.clientPolyface();
         if (polyface !== undefined && polyface.facetCount !== undefined)
             return polyface.facetCount;
         let facetCount = 0;
-        visitor.reset();
-        while (visitor.moveToNextFacet())
+        source.reset();
+        while (source.moveToNextFacet())
             ++facetCount;
         return facetCount;
     }
-    /** Partition the facet set into connected components such that two adjacent facets are in the same component if and only if they are adjacent across a clustered edge.
+    /**
+     * Partition the facet set into connected components such that two adjacent facets are in the same component if and
+     * only if they are adjacent across a clustered edge.
      * @param edgeClusters sorted and clustered edges (cf. `IndexedEdgeMatcher.sortAndCollectClusters`).
      * @param numFacets facet count in the parent mesh. In particular, `edge.facetIndex < numFacets` for every input edge.
-     * @return collection of facet index arrays, one array per connected component
+     * @return collection of facet index arrays, one array per connected component.
      */
     static partitionFacetIndicesBySortableEdgeClusters(edgeClusters, numFacets) {
         const context = new _numerics_UnionFind__WEBPACK_IMPORTED_MODULE_14__.UnionFindContext(numFacets);
@@ -238917,10 +239068,12 @@ class PolyfaceQuery {
         }
         return facetsInComponent;
     }
-    /** Partition the facet set into connected components. Each facet in a given component shares an edge only with other facets in the component (or is a boundary edge).
-     * @param polyface facets to partition
-     * @param stopAtVisibleEdges whether to further split connected components by visible edges of the polyface
-     * @return collection of facet index arrays, one per connected component
+    /**
+     * Partition the facet set into connected components. Each facet in a given component shares an edge only with
+     * other facets in the component (or is a boundary edge).
+     * @param polyface facets to partition.
+     * @param stopAtVisibleEdges whether to further split connected components by visible edges of the polyface.
+     * @return collection of facet index arrays, one per connected component.
      */
     static partitionFacetIndicesByEdgeConnectedComponent(polyface, stopAtVisibleEdges = false) {
         if (polyface instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
@@ -238945,7 +239098,8 @@ class PolyfaceQuery {
         matcher.sortAndCollectClusters(allEdges, allEdges, allEdges, allEdges);
         return this.partitionFacetIndicesBySortableEdgeClusters(allEdges, numFacets);
     }
-    /** Find segments (within the line string) which project to facets.
+    /**
+     * Find segments (within the line string) which project to facets.
      * * Assemble each input segment paired with its projected segment/point as a quad/triangle facet in a new polyface.
      * * Input facets are ASSUMED to be convex and planar, and not overlap in the z direction.
      */
@@ -238959,7 +239113,7 @@ class PolyfaceQuery {
         });
         return builder.claimPolyface(true);
     }
-    /** @deprecated in 4.x. Use sweepLineStringToFacetsXYReturnSweptFacets instead. */
+    /** @deprecated in 4.x. Use [[sweepLineStringToFacetsXYReturnSweptFacets]] instead. */
     static sweepLinestringToFacetsXYreturnSweptFacets(linestringPoints, polyface) {
         return this.sweepLineStringToFacetsXYReturnSweptFacets(linestringPoints, polyface);
     }
@@ -238972,11 +239126,10 @@ class PolyfaceQuery {
      */
     static sweepLineStringToFacets(linestringPoints, polyfaceOrVisitor, options) {
         let result = [];
-        // setup default options:
+        // setup default options
         if (options === undefined)
             options = SweepLineStringToFacetsOptions.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.unitZ(), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createRadians(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallAngleRadians), // tight geometry tolerance for vertical side facets
-            true, // assemble chains
-            true, true, true); // accept all outputs
+            true, true, true, true);
         let chainContext;
         if (options.assembleChains)
             chainContext = _topology_ChainMerge__WEBPACK_IMPORTED_MODULE_25__.ChainMergeContext.create();
@@ -239007,9 +239160,9 @@ class PolyfaceQuery {
     }
     /**
      * Sweep the line string in the z-direction to intersections with a mesh, using a search object for speedup.
-     * @param lineStringPoints input line string to drape on the mesh
-     * @param polyfaceOrVisitor mesh, or mesh visitor to traverse only part of a mesh
-     * @param searchByReadIndex object for searching facet 2D ranges tagged by mesh read index
+     * @param lineStringPoints input line string to drape on the mesh.
+     * @param polyfaceOrVisitor mesh, or mesh visitor to traverse only part of a mesh.
+     * @param searchByReadIndex object for searching facet 2D ranges tagged by mesh read index.
      * @example Using a 5x5 indexed search grid:
      * ```
      * const xyRange = Range2d.createFrom(myPolyface.range());
@@ -239019,7 +239172,7 @@ class PolyfaceQuery {
      * }
      * const drapedLineStrings = PolyfaceQuery.sweepLineStringToFacetsXY(lineString, myPolyface, searcher);
      * ```
-     * @returns collected line strings
+     * @returns the collected line strings.
      */
     static sweepLineStringToFacetsXY(lineStringPoints, polyfaceOrVisitor, searchByReadIndex) {
         const chainContext = _topology_ChainMerge__WEBPACK_IMPORTED_MODULE_25__.ChainMergeContext.create();
@@ -239053,32 +239206,36 @@ class PolyfaceQuery {
         chainContext.clusterAndMergeVerticesXYZ();
         return chainContext.collectMaximalChains();
     }
-    /** Find segments (within the linestring) which project to facets.
+    /**
+     * Find segments (within the linestring) which project to facets.
       * * Return collected line segments.
       * * This calls [[sweepLineStringToFacets]] with options created by
-      *   `const options = SweepLineStringToFacetsOptions.create(Vector3d.unitZ(), Angle.createSmallAngle(),false, true, true, true);`
-      * @deprecated in 4.x. Use [[sweepLineStringToFacets]] to get further options.
+      *   `const options = SweepLineStringToFacetsOptions.create(Vector3d.unitZ(), Angle.createSmallAngle(), false, true, true, true);`
+      * @deprecated in 4.x. Use [[PolyfaceQuery.sweepLineStringToFacets]] to get further options.
       */
     static sweepLinestringToFacetsXYReturnLines(linestringPoints, polyface) {
         const options = SweepLineStringToFacetsOptions.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.unitZ(), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createSmallAngle(), false, true, true, true);
         const result = PolyfaceQuery.sweepLineStringToFacets(linestringPoints, polyface, options);
         return result;
     }
-    /** Find segments (within the linestring) which project to facets.
+    /**
+     * Find segments (within the linestring) which project to facets.
      * * Return chains.
      * * This calls [[sweepLineStringToFacets]] with options created by
      *   `const options = SweepLineStringToFacetsOptions.create(Vector3d.unitZ(), Angle.createSmallAngle(),true, true, true, true);`
-     * @deprecated in 4.x. Use [[sweepLineStringToFacets]] to get further options.
+     * @deprecated in 4.x. Use [[PolyfaceQuery.sweepLineStringToFacets]] to get further options.
      */
     static sweepLinestringToFacetsXYReturnChains(linestringPoints, polyface) {
         const options = SweepLineStringToFacetsOptions.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.unitZ(), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_1__.Angle.createSmallAngle(), true, true, true, true);
         const result = PolyfaceQuery.sweepLineStringToFacets(linestringPoints, polyface, options);
         return result;
     }
-    /** Find segments (within the linestring) which project to facets.
+    /**
+     * Find segments (within the linestring) which project to facets.
      * * This is done as a sequence of "await" steps.
-     * * Each "await" step deals with approximately PolyfaceQuery.asyncWorkLimit pairings of (linestring edge) with (facet edge)
-     * * PolyfaceQuery.setAsyncWorkLimit() to change work blocks from default
+     * * Each "await" step deals with approximately PolyfaceQuery.asyncWorkLimit pairings of "linestring edge"
+     * with "facet edge".
+     * * PolyfaceQuery.setAsyncWorkLimit() to change work blocks from default.
      * * Return chains.
      * * Facets are ASSUMED to be convex and planar, and not overlap in the z direction.
      */
@@ -239092,7 +239249,7 @@ class PolyfaceQuery {
         return chains;
     }
     /**
-     * * Examine ranges of facets.
+     * Examine ranges of facets.
      * * Return statistical summary of x,y,z ranges.
      */
     static collectRangeLengthData(polyface) {
@@ -239100,17 +239257,18 @@ class PolyfaceQuery {
             return this.collectRangeLengthData(polyface.createVisitor(0));
         }
         const rangeData = new _RangeLengthData__WEBPACK_IMPORTED_MODULE_28__.RangeLengthData();
-        // polyface is a visitor ...
+        // polyface is a visitor
         for (polyface.reset(); polyface.moveToNextFacet();)
             rangeData.accumulateGrowableXYZArrayRange(polyface.point);
         return rangeData;
     }
-    /** Clone the facets, inserting vertices (within edges) where points not part of each facet's vertex indices impinge within edges.
-     *
+    /**
+     * Clone the facets, inserting vertices (within edges) where points not part of each facet's vertex indices
+     * impinge within edges.
      */
     static cloneWithTVertexFixup(polyface) {
-        const oldFacetVisitor = polyface.createVisitor(1); // This is to visit the existing facets.
-        const newFacetVisitor = polyface.createVisitor(0); // This is to build the new facets.
+        const oldFacetVisitor = polyface.createVisitor(1); // this is to visit the existing facets
+        const newFacetVisitor = polyface.createVisitor(0); // this is to build the new facets
         const rangeSearcher = _multiclip_XYPointBuckets__WEBPACK_IMPORTED_MODULE_29__.XYPointBuckets.create(polyface.data.point, 30);
         const builder = _PolyfaceBuilder__WEBPACK_IMPORTED_MODULE_16__.PolyfaceBuilder.create();
         const edgeRange = _geometry3d_Range__WEBPACK_IMPORTED_MODULE_26__.Range3d.createNull();
@@ -239121,7 +239279,7 @@ class PolyfaceQuery {
         for (oldFacetVisitor.reset(); oldFacetVisitor.moveToNextFacet();) {
             newFacetVisitor.clearArrays();
             for (let i = 0; i + 1 < oldFacetVisitor.point.length; i++) {
-                // each base vertex is part of the result ...
+                // each base vertex is part of the result
                 oldFacetVisitor.point.getPoint3dAtUncheckedPointIndex(i, point0);
                 oldFacetVisitor.point.getPoint3dAtUncheckedPointIndex(i + 1, point1);
                 newFacetVisitor.pushDataFrom(oldFacetVisitor, i);
@@ -239132,12 +239290,12 @@ class PolyfaceQuery {
                 edgeRange.extend(point1);
                 edgeRange.ensureMinLengths(_Geometry__WEBPACK_IMPORTED_MODULE_2__.Geometry.smallMetricDistance); // add some slop in case segment is axis-aligned
                 rangeSearcher.announcePointsInRange(edgeRange, (index, _x, _y, _z) => {
-                    // x,y,z has x,y within the range of the search ... test for exact on (in full 3d!)
+                    // x,y,z has x,y within the range of the search; test for exact on (in full 3d)
                     polyface.data.point.getPoint3dAtUncheckedPointIndex(index, spacePoint);
                     const detail = segment.closestPoint(spacePoint, false);
                     if (undefined !== detail) {
-                        if (detail.fraction > 0.0 && detail.fraction < 1.0 && !detail.point.isAlmostEqual(point0) && !detail.point.isAlmostEqual(point1)
-                            && spacePoint.isAlmostEqual(detail.point)) {
+                        if (detail.fraction > 0.0 && detail.fraction < 1.0 && !detail.point.isAlmostEqual(point0) &&
+                            !detail.point.isAlmostEqual(point1) && spacePoint.isAlmostEqual(detail.point)) {
                             if (detailArray === undefined)
                                 detailArray = [];
                             detail.a = index;
@@ -239158,14 +239316,13 @@ class PolyfaceQuery {
         return builder.claimPolyface();
     }
     /**
+     * Compare index arrays formatted as follows. Return 0 if arrays are the same.
      * * Each array input structure is: [facetIndex, vertexIndex0, vertexIndex1, ....]
-     * * Vertex indices assumed reversed so it
-     *   * vertexIndex0 is the lowest index on the facet
-     *   * vertexIndex1 is the lowest neighbor of vertex0
+     * * Vertex indices assumed reversed so:
+     *   * vertexIndex0 is the lowest index on the facet.
+     *   * vertexIndex1 is the lowest neighbor of vertex0.
      *   * first different entry among vertex indices determines lexical result.
-     *   * Hence facets with duplicate indices (whether forward or reversed) are considered equal.
-     * @param arrayA
-     * @param arrayB
+     *   * hence facets with duplicate indices (whether forward or reversed) are considered equal.
      */
     static compareFacetIndexAndVertexIndices(arrayA, arrayB) {
         if (arrayA.length !== arrayB.length)
@@ -239178,25 +239335,12 @@ class PolyfaceQuery {
         return 0;
     }
     /**
-     * * Return an array of arrays describing facet duplication.
-     * @param includeSingletons if true, non-duplicated facets are included in the output.
-     * * Each array `entry` in the output contains read indices of a cluster of facets with the same vertex indices.
-     */
-    static collectDuplicateFacetIndices(polyface, includeSingletons = false) {
-        const result = [];
-        this.announceDuplicateFacetIndices(polyface, (clusterFacetIndices) => {
-            if (includeSingletons || clusterFacetIndices.length > 1)
-                result.push(clusterFacetIndices.slice());
-        });
-        return result;
-    }
-    /**
-     * * Return an array of arrays describing facet duplication.
-     * @param includeSingletons if true, non-duplicated facets are included in the output.
-     * * Each array `entry` in the output contains read indices of a cluster of facets with the same vertex indices.
+     * Announce facet duplicates.
+     * @returns an array of arrays describing facet duplication. Each array `entry` in the output contains read
+     * indices of a cluster of facets with the same vertex indices.
      */
     static announceDuplicateFacetIndices(polyface, announceCluster) {
-        const visitor = polyface.createVisitor(0); // This is to visit the existing facets.
+        const visitor = polyface.createVisitor(0); // this is to visit the existing facets
         const facetIndexAndVertexIndices = [];
         for (visitor.reset(); visitor.moveToNextFacet();) {
             const facetIndex = visitor.currentReadIndex();
@@ -239204,12 +239348,12 @@ class PolyfaceQuery {
             const pointIndex = visitor.pointIndex;
             const numPointsThisFacet = pointIndex.length;
             let lowIndex = 0;
-            // find the lowest point index ...
+            // find the lowest point index
             for (let i = 1; i < visitor.pointIndex.length; i++) {
                 if (pointIndex[i] < pointIndex[lowIndex])
                     lowIndex = i;
             }
-            // find its lowest neighbor -- assemble sort array in that direction
+            // find its lowest neighbor; assemble sort array in that direction
             if (pointIndex[(lowIndex + 1) % numPointsThisFacet] < pointIndex[(lowIndex + numPointsThisFacet - 1) % numPointsThisFacet]) {
                 for (let i = 0; i < numPointsThisFacet; i++) {
                     entry.push(pointIndex[(lowIndex + i) % numPointsThisFacet]);
@@ -239237,9 +239381,26 @@ class PolyfaceQuery {
             announceCluster(clusterArray);
         }
     }
-    /** Return a new facet set with a subset of facets in source
+    /**
+     * Collect facet duplicates.
+     * @param polyface the polyface.
+     * @param includeSingletons if true, non-duplicated facets are included in the output.
+     * @returns an array of arrays describing facet duplication. Each array `entry` in the output contains read
+     * indices of a cluster of facets with the same vertex indices.
+     */
+    static collectDuplicateFacetIndices(polyface, includeSingletons = false) {
+        const result = [];
+        this.announceDuplicateFacetIndices(polyface, (clusterFacetIndices) => {
+            if (includeSingletons || clusterFacetIndices.length > 1)
+                result.push(clusterFacetIndices.slice());
+        });
+        return result;
+    }
+    /**
+     * Return a new facet set with a subset of facets in polyface.
+     * @param source the polyface.
      * @param includeSingletons true to copy facets that only appear once
-     * @param clusterSelector indicates whether duplicate clusters are to have 0, 1, or all facets included
+     * @param clusterSelector indicates whether duplicate clusters are to have 0, 1, or all facets included.
      */
     static cloneByFacetDuplication(source, includeSingletons, clusterSelector) {
         const builder = _PolyfaceBuilder__WEBPACK_IMPORTED_MODULE_16__.PolyfaceBuilder.create();
@@ -239265,25 +239426,23 @@ class PolyfaceQuery {
         });
         return builder.claimPolyface();
     }
-    /** Clone the facets, inserting removing points that are simply within colinear edges.
-     *
-     */
+    /** Clone the facets, removing points that are simply within colinear edges. */
     static cloneWithColinearEdgeFixup(polyface) {
-        const oldFacetVisitor = polyface.createVisitor(2); // This is to visit the existing facets.
-        const newFacetVisitor = polyface.createVisitor(0); // This is to build the new facets.
+        const oldFacetVisitor = polyface.createVisitor(2); // this is to visit the existing facets
+        const newFacetVisitor = polyface.createVisitor(0); // this is to build the new facets
         const builder = _PolyfaceBuilder__WEBPACK_IMPORTED_MODULE_16__.PolyfaceBuilder.create();
         const vector01 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.create();
         const vector12 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_0__.Vector3d.create();
         const numPoint = polyface.data.point.length;
         const pointState = new Int32Array(numPoint);
-        // FIRST PASS -- in each sector of each facet, determine if the sector has colinear incoming and outgoing vectors.
-        //   Mark each point as
-        //  0 unvisited
-        // -1 incident to a non-colinear sector
-        //  n incident to n colinear sectors
+        // FIRST PASS: in each sector of each facet, determine if the sector has colinear incoming and outgoing vectors.
+        // Mark each point as
+        //    0 unvisited
+        //   -1 adjacent to a non-colinear sector
+        //    n adjacent to n colinear sectors
         for (oldFacetVisitor.reset(); oldFacetVisitor.moveToNextFacet();) {
             for (let i = 0; i + 2 < oldFacetVisitor.point.length; i++) {
-                // each base vertex is part of the result ...
+                // each base vertex is part of the result
                 oldFacetVisitor.point.vectorIndexIndex(i, i + 1, vector01);
                 oldFacetVisitor.point.vectorIndexIndex(i + 1, i + 2, vector12);
                 const pointIndex = oldFacetVisitor.clientPointIndex(i + 1);
@@ -239298,7 +239457,7 @@ class PolyfaceQuery {
                 }
             }
         }
-        // SECOND PASS -- make copies, omitting references to points at colinear sectors
+        // SECOND PASS: make copies, omitting references to points at colinear sectors.
         for (oldFacetVisitor.reset(); oldFacetVisitor.moveToNextFacet();) {
             newFacetVisitor.clearArrays();
             for (let i = 0; i + 2 < oldFacetVisitor.point.length; i++) {
@@ -239314,9 +239473,9 @@ class PolyfaceQuery {
     }
     /**
      * Set the edge visibility for specified edges in the polyface.
-     * @param polyface mesh to be edited
-     * @param clusters array of edge references
-     * @param value visibility value (true or false)
+     * @param polyface mesh to be edited.
+     * @param clusters array of edge references.
+     * @param value visibility value (true or false).
      */
     static setEdgeVisibility(polyface, clusters, value) {
         for (const cluster of clusters) {
@@ -239331,9 +239490,9 @@ class PolyfaceQuery {
     }
     /**
      * Set the visibility of a particular edge of a particular facet.
-     * @param polyface containing polyface
-     * @param facetIndex facet index
-     * @param vertexIndex vertex index (in vertex array) at which the edge starts
+     * @param polyface containing polyface.
+     * @param facetIndex facet index.
+     * @param vertexIndex vertex index (in vertex array) at which the edge starts.
      * @param value visibility value.
      */
     static setSingleEdgeVisibility(polyface, facetIndex, vertexIndex, value) {
@@ -239346,9 +239505,9 @@ class PolyfaceQuery {
     }
     /**
      * Get the visibility of a particular edge of a particular facet.
-     * @param polyface containing polyface
-     * @param facetIndex facet index
-     * @param vertexIndex vertex index (in vertex array) at which the edge starts
+     * @param polyface containing polyface.
+     * @param facetIndex facet index.
+     * @param vertexIndex vertex index (in vertex array) at which the edge starts.
      */
     static getSingleEdgeVisibility(polyface, facetIndex, vertexIndex) {
         const data = polyface.data;
@@ -239359,29 +239518,13 @@ class PolyfaceQuery {
                 return data.edgeVisible[i]; // return visibility of first edge in the face that starts at this vertex
         return undefined;
     }
-    /** Load all half edges from a mesh to an IndexedEdgeMatcher.
-     * @param polyface a mesh, or a visitor assumed to have numWrap === 1
-    */
-    static createIndexedEdges(polyface) {
-        if (polyface instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
-            return this.createIndexedEdges(polyface.createVisitor(1));
-        const edges = new _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.IndexedEdgeMatcher();
-        polyface.reset();
-        while (polyface.moveToNextFacet()) {
-            const numEdges = polyface.pointCount - 1;
-            for (let i = 0; i < numEdges; i++) {
-                edges.addEdge(polyface.clientPointIndex(i), polyface.clientPointIndex(i + 1), polyface.currentReadIndex());
-            }
-        }
-        return edges;
-    }
     /**
      * Return manifold edge pairs whose dihedral angle is bounded by the given angle.
      * * The dihedral angle of a manifold edge is measured between the normals of its two adjacent faces.
      * * Boundary edges are not returned as they are not manifold.
-     * @param mesh existing polyface or visitor
-     * @param maxSmoothEdgeAngle maximum dihedral angle of a smooth edge. If undefined, uses `Geometry.smallAngleRadians`.
-     * @param sharpEdges true to reverse the angle threshold test and return sharp edges; otherwise return smooth edges (default)
+     * @param mesh existing polyface or visitor.
+     * @param maxSmoothEdgeAngle maximum dihedral angle of a smooth edge. If `undefined`, uses `Geometry.smallAngleRadians`.
+     * @param sharpEdges true to reverse the angle threshold test and return sharp edges; otherwise return smooth edges (default).
      */
     static collectEdgesByDihedralAngle(mesh, maxSmoothEdgeAngle, sharpEdges = false) {
         if (mesh instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface)
@@ -239416,13 +239559,13 @@ class PolyfaceQuery {
         return outEdges;
     }
     /**
+     * Make paired edges invisible.
     * * Find mated pairs among facet edges.
     * * Mated pairs have the same vertex indices appearing in opposite order.
     * * Mark all non-mated pairs visible.
     * * At mated pairs
     *    * if angle across the edge is larger than `sharpEdgeAngle`, mark visible
     *    * otherwise mark invisible.
-    * @param mesh mesh to be marked
     */
     static markPairedEdgesInvisible(mesh, sharpEdgeAngle) {
         const visitor = mesh.createVisitor(1);
@@ -239451,7 +239594,8 @@ class PolyfaceQuery {
             }
         }
     }
-    /** Try to compute a unit normal for a facet accessible through a visitor.
+    /**
+     * Try to compute a unit normal for a facet accessible through a visitor.
      * * Unit normal is computed by `PolygonOps.unitNormal` with the points around the facet.
      */
     static computeFacetUnitNormal(visitor, facetIndex, result) {
@@ -239464,18 +239608,18 @@ class PolyfaceQuery {
         return undefined;
     }
     /**
-    * * Mark all edge visibilities in the IndexedPolyface
-    * @param mesh mesh to be marked
-    * @param value true for visible, false for hidden
-    */
+     * * Mark all edge visibilities in the IndexedPolyface.
+     * @param mesh mesh to be marked.
+     * @param value true for visible, false for hidden.
+     */
     static markAllEdgeVisibility(mesh, value) {
         const data = mesh.data;
         for (let i = 0; i < data.edgeVisible.length; i++)
             data.edgeVisible[i] = value;
     }
     /**
-     * Create a HalfEdgeGraph with a face for each facet of the IndexedPolyface
-     * @param mesh mesh to convert
+     * Create a HalfEdgeGraph with a face for each facet of the IndexedPolyface.
+     * @param mesh mesh to convert.
      * @internal
      */
     static convertToHalfEdgeGraph(mesh) {
@@ -239494,28 +239638,22 @@ class PolyfaceQuery {
         });
         return graph;
     }
-    /**
-     * * Examine adjacent facet orientations throughout the mesh
-     * * If possible, reverse a subset to achieve proper pairing.
-     * @param mesh
-     */
+    /** Examine adjacent facet orientations throughout the mesh. If possible, reverse a subset to achieve proper pairing. */
     static reorientVertexOrderAroundFacetsForConsistentOrientation(mesh) {
         return _FacetOrientation__WEBPACK_IMPORTED_MODULE_31__.FacetOrientationFixup.doFixup(mesh);
     }
-    /**
-     * Set up indexed normals with one normal in the plane of each facet of the mesh.
-     * @param polyface
-     */
+    /** Set up indexed normals with one normal in the plane of each facet of the mesh. */
     static buildPerFaceNormals(polyface) {
         _multiclip_BuildAverageNormalsContext__WEBPACK_IMPORTED_MODULE_32__.BuildAverageNormalsContext.buildPerFaceNormals(polyface);
     }
     /**
-    * * At each vertex of the mesh
-    *   * Find clusters of almost parallel normals
-    *   * Compute simple average of those normals
-    *   * Index to the averages
+    * * At each vertex of the mesh:
+    *   * Find clusters of almost parallel normals.
+    *   * Compute simple average of those normals.
+    *   * Index to the averages.
     * * For typical meshes, this correctly clusters adjacent normals.
-    * * One can imagine a vertex with multiple "smooth cone-like" sets of incident facets such that averaging occurs among two nonadjacent cones.  But this does not seem to be a problem in practice.
+    * * One can imagine a vertex with multiple "smooth cone-like" sets of adjacent facets such that averaging occurs
+    * among two nonadjacent cones. But this does not seem to be a problem in practice.
     * @param polyface polyface to update.
     * @param toleranceAngle averaging is done between normals up to this angle.
     */
@@ -239524,9 +239662,9 @@ class PolyfaceQuery {
     }
     /**
      * Offset the faces of the mesh.
-     * @param source original mesh
+     * @param source original mesh.
      * @param signedOffsetDistance distance to offset
-     * @param offsetOptions angle options.  The default options are recommended.
+     * @param offsetOptions angle options. The default options are recommended.
      * @returns shifted mesh.
      */
     static cloneOffset(source, signedOffsetDistance, offsetOptions = OffsetMeshOptions.create()) {
@@ -239535,16 +239673,22 @@ class PolyfaceQuery {
         _multiclip_OffsetMeshContext__WEBPACK_IMPORTED_MODULE_33__.OffsetMeshContext.buildOffsetMeshWithEdgeChamfers(source, offsetBuilder, signedOffsetDistance, offsetOptions);
         return offsetBuilder.claimPolyface();
     }
-    /** Search facets for the first one that intersects the infinite line.
-     * * To process _all_ intersections, callers can supply an `options.acceptIntersection` callback that always returns false.
-     * In this case, `intersectRay3d` will return undefined, but the callback will be invoked for each intersection.
+    /**
+     * Search facets for the first one that intersects the infinite line.
+     * * To process _all_ intersections, callers can supply an `options.acceptIntersection` callback that always
+     * returns `false`.
+     * In this case, `intersectRay3d` will return `undefined`, but the callback will be invoked for each intersection.
      * * Example callback logic:
      *    * Accept the first found facet that intersects the half-line specified by the ray: `return detail.a >= 0.0;`
-     *    * Collect all intersections: `myIntersections.push(detail.clone()); return false;` Then after `intersectRay3d` returns, sort along `ray` with `myIntersections.sort((d0, d1) => d0.a - d1.a);`
-     * @param visitor facet iterator
-     * @param ray infinite line parameterized as a ray. The returned `detail.a` is the intersection parameter on the ray, e.g., zero at `ray.origin` and increasing in `ray.direction`.
-     * @param options options for computing and populating an intersection detail, and an optional callback for accepting one
-     * @return detail for the (accepted) intersection with `detail.IsInsideOrOn === true`, or `undefined` if no (accepted) intersection
+     *    * Collect all intersections: `myIntersections.push(detail.clone()); return false;` Then after `intersectRay3d`
+     * returns, sort along `ray` with `myIntersections.sort((d0, d1) => d0.a - d1.a);`
+     * @param visitor facet iterator.
+     * @param ray infinite line parameterized as a ray. The returned `detail.a` is the intersection parameter on the
+     * ray, e.g., zero at `ray.origin` and increasing in `ray.direction`.
+     * @param options options for computing and populating an intersection detail, and an optional callback for
+     * accepting one.
+     * @return detail for the (accepted) intersection with `detail.IsInsideOrOn === true`, or `undefined` if no
+     * (accepted) intersection.
      * @see PolygonOps.intersectRay3d
     */
     static intersectRay3d(visitor, ray, options) {
@@ -239587,7 +239731,8 @@ class PolyfaceQuery {
 }
 // amount of computation to do per step of async methods.
 PolyfaceQuery._asyncWorkLimit = 1.e06;
-/** Number of "await" steps executed in recent async calls.
+/**
+ * Number of "await" steps executed in recent async calls.
  * @internal
  */
 PolyfaceQuery.awaitBlockCount = 0;
@@ -248951,44 +249096,45 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "DgnSpiralTypeQueries": () => (/* binding */ DgnSpiralTypeQueries)
 /* harmony export */ });
 /* harmony import */ var flatbuffers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! flatbuffers */ "../../common/temp/node_modules/.pnpm/flatbuffers@1.12.0/node_modules/flatbuffers/js/flatbuffers.mjs");
-/* harmony import */ var _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../bspline/AkimaCurve3d */ "../../core/geometry/lib/esm/bspline/AkimaCurve3d.js");
-/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
-/* harmony import */ var _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../bspline/BSplineCurve3dH */ "../../core/geometry/lib/esm/bspline/BSplineCurve3dH.js");
-/* harmony import */ var _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../bspline/BSplineSurface */ "../../core/geometry/lib/esm/bspline/BSplineSurface.js");
-/* harmony import */ var _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../bspline/InterpolationCurve3d */ "../../core/geometry/lib/esm/bspline/InterpolationCurve3d.js");
-/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
-/* harmony import */ var _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../curve/CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
-/* harmony import */ var _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../curve/GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
-/* harmony import */ var _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../curve/LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
-/* harmony import */ var _curve_LineString3d__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../curve/LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
-/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
-/* harmony import */ var _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../curve/ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
-/* harmony import */ var _curve_Path__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../curve/Path */ "../../core/geometry/lib/esm/curve/Path.js");
-/* harmony import */ var _curve_PointString3d__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../curve/PointString3d */ "../../core/geometry/lib/esm/curve/PointString3d.js");
-/* harmony import */ var _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../curve/spiral/DirectSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/DirectSpiral3d.js");
-/* harmony import */ var _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../curve/spiral/IntegratedSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/IntegratedSpiral3d.js");
-/* harmony import */ var _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../curve/spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
-/* harmony import */ var _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../curve/UnionRegion */ "../../core/geometry/lib/esm/curve/UnionRegion.js");
-/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
-/* harmony import */ var _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.js");
-/* harmony import */ var _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../geometry3d/AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
-/* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
-/* harmony import */ var _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../geometry3d/PointHelpers */ "../../core/geometry/lib/esm/geometry3d/PointHelpers.js");
-/* harmony import */ var _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../geometry3d/Ray3d */ "../../core/geometry/lib/esm/geometry3d/Ray3d.js");
-/* harmony import */ var _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../geometry3d/Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
-/* harmony import */ var _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../geometry3d/Transform */ "../../core/geometry/lib/esm/geometry3d/Transform.js");
-/* harmony import */ var _polyface_AuxData__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../polyface/AuxData */ "../../core/geometry/lib/esm/polyface/AuxData.js");
-/* harmony import */ var _polyface_Polyface__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../polyface/Polyface */ "../../core/geometry/lib/esm/polyface/Polyface.js");
-/* harmony import */ var _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../polyface/TaggedNumericData */ "../../core/geometry/lib/esm/polyface/TaggedNumericData.js");
-/* harmony import */ var _solid_Box__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../solid/Box */ "../../core/geometry/lib/esm/solid/Box.js");
-/* harmony import */ var _solid_Cone__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../solid/Cone */ "../../core/geometry/lib/esm/solid/Cone.js");
-/* harmony import */ var _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../solid/LinearSweep */ "../../core/geometry/lib/esm/solid/LinearSweep.js");
-/* harmony import */ var _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../solid/RotationalSweep */ "../../core/geometry/lib/esm/solid/RotationalSweep.js");
-/* harmony import */ var _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../solid/RuledSweep */ "../../core/geometry/lib/esm/solid/RuledSweep.js");
-/* harmony import */ var _solid_Sphere__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../solid/Sphere */ "../../core/geometry/lib/esm/solid/Sphere.js");
-/* harmony import */ var _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../solid/TorusPipe */ "../../core/geometry/lib/esm/solid/TorusPipe.js");
-/* harmony import */ var _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./BGFBAccessors */ "../../core/geometry/lib/esm/serialization/BGFBAccessors.js");
-/* harmony import */ var _SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SerializationHelpers */ "../../core/geometry/lib/esm/serialization/SerializationHelpers.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../bspline/AkimaCurve3d */ "../../core/geometry/lib/esm/bspline/AkimaCurve3d.js");
+/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
+/* harmony import */ var _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../bspline/BSplineCurve3dH */ "../../core/geometry/lib/esm/bspline/BSplineCurve3dH.js");
+/* harmony import */ var _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../bspline/BSplineSurface */ "../../core/geometry/lib/esm/bspline/BSplineSurface.js");
+/* harmony import */ var _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../bspline/InterpolationCurve3d */ "../../core/geometry/lib/esm/bspline/InterpolationCurve3d.js");
+/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
+/* harmony import */ var _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ../curve/CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
+/* harmony import */ var _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../curve/GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
+/* harmony import */ var _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../curve/LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
+/* harmony import */ var _curve_LineString3d__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../curve/LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
+/* harmony import */ var _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../curve/ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
+/* harmony import */ var _curve_Path__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../curve/Path */ "../../core/geometry/lib/esm/curve/Path.js");
+/* harmony import */ var _curve_PointString3d__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../curve/PointString3d */ "../../core/geometry/lib/esm/curve/PointString3d.js");
+/* harmony import */ var _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../curve/spiral/DirectSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/DirectSpiral3d.js");
+/* harmony import */ var _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../curve/spiral/IntegratedSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/IntegratedSpiral3d.js");
+/* harmony import */ var _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../curve/spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
+/* harmony import */ var _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../curve/UnionRegion */ "../../core/geometry/lib/esm/curve/UnionRegion.js");
+/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
+/* harmony import */ var _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.js");
+/* harmony import */ var _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../geometry3d/AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
+/* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
+/* harmony import */ var _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../geometry3d/PointHelpers */ "../../core/geometry/lib/esm/geometry3d/PointHelpers.js");
+/* harmony import */ var _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../geometry3d/Ray3d */ "../../core/geometry/lib/esm/geometry3d/Ray3d.js");
+/* harmony import */ var _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../geometry3d/Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
+/* harmony import */ var _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../geometry3d/Transform */ "../../core/geometry/lib/esm/geometry3d/Transform.js");
+/* harmony import */ var _polyface_AuxData__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../polyface/AuxData */ "../../core/geometry/lib/esm/polyface/AuxData.js");
+/* harmony import */ var _polyface_Polyface__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../polyface/Polyface */ "../../core/geometry/lib/esm/polyface/Polyface.js");
+/* harmony import */ var _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../polyface/TaggedNumericData */ "../../core/geometry/lib/esm/polyface/TaggedNumericData.js");
+/* harmony import */ var _solid_Box__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../solid/Box */ "../../core/geometry/lib/esm/solid/Box.js");
+/* harmony import */ var _solid_Cone__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../solid/Cone */ "../../core/geometry/lib/esm/solid/Cone.js");
+/* harmony import */ var _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../solid/LinearSweep */ "../../core/geometry/lib/esm/solid/LinearSweep.js");
+/* harmony import */ var _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../solid/RotationalSweep */ "../../core/geometry/lib/esm/solid/RotationalSweep.js");
+/* harmony import */ var _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../solid/RuledSweep */ "../../core/geometry/lib/esm/solid/RuledSweep.js");
+/* harmony import */ var _solid_Sphere__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../solid/Sphere */ "../../core/geometry/lib/esm/solid/Sphere.js");
+/* harmony import */ var _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../solid/TorusPipe */ "../../core/geometry/lib/esm/solid/TorusPipe.js");
+/* harmony import */ var _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./BGFBAccessors */ "../../core/geometry/lib/esm/serialization/BGFBAccessors.js");
+/* harmony import */ var _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./SerializationHelpers */ "../../core/geometry/lib/esm/serialization/SerializationHelpers.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -249030,6 +249176,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 /** * Context to write to a flatbuffer blob.
@@ -249047,8 +249194,8 @@ class BGFBReader {
     readBSplineSurfaceFromVariant(variantHeader) {
         let newSurface;
         const geometryType = variantHeader.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagBsplineSurface) {
-            const bsurfHeader = variantHeader.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.BsplineSurface());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagBsplineSurface) {
+            const bsurfHeader = variantHeader.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.BsplineSurface());
             if (bsurfHeader !== null) {
                 const orderU = bsurfHeader.orderU();
                 const orderV = bsurfHeader.orderV();
@@ -249061,23 +249208,23 @@ class BGFBReader {
                 const closedU = bsurfHeader.closedU();
                 const closedV = bsurfHeader.closedV();
                 if (xyzArray !== null && knotArrayU !== null && knotArrayV !== null) {
-                    const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__.SerializationHelpers.createBSplineSurfaceData(xyzArray, 3, knotArrayU, numPolesU, orderU, knotArrayV, numPolesV, orderV);
+                    const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.createBSplineSurfaceData(xyzArray, 3, knotArrayU, numPolesU, orderU, knotArrayV, numPolesV, orderV);
                     if (weightArray !== null)
                         myData.weights = weightArray;
                     if (closedU)
                         myData.uParams.closed = true;
                     if (closedV)
                         myData.vParams.closed = true;
-                    if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__.SerializationHelpers.Import.prepareBSplineSurfaceData(myData, { jsonPoles: false })) {
+                    if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.Import.prepareBSplineSurfaceData(myData, { jsonPoles: false })) {
                         if (undefined === myData.weights)
-                            newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_3__.BSplineSurface3d.create(myData.poles, myData.uParams.numPoles, myData.uParams.order, myData.uParams.knots, myData.vParams.numPoles, myData.vParams.order, myData.vParams.knots);
+                            newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_4__.BSplineSurface3d.create(myData.poles, myData.uParams.numPoles, myData.uParams.order, myData.uParams.knots, myData.vParams.numPoles, myData.vParams.order, myData.vParams.knots);
                         else
-                            newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_3__.BSplineSurface3dH.create(myData.poles, myData.weights, myData.uParams.numPoles, myData.uParams.order, myData.uParams.knots, myData.vParams.numPoles, myData.vParams.order, myData.vParams.knots);
+                            newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_4__.BSplineSurface3dH.create(myData.poles, myData.weights, myData.uParams.numPoles, myData.uParams.order, myData.uParams.knots, myData.vParams.numPoles, myData.vParams.order, myData.vParams.knots);
                         if (undefined !== newSurface) {
                             if (undefined !== myData.uParams.wrapMode)
-                                newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_3__.UVSelect.uDirection, myData.uParams.wrapMode);
+                                newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_4__.UVSelect.uDirection, myData.uParams.wrapMode);
                             if (undefined !== myData.vParams.wrapMode)
-                                newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_3__.UVSelect.vDirection, myData.vParams.wrapMode);
+                                newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_4__.UVSelect.vDirection, myData.vParams.wrapMode);
                         }
                     }
                 }
@@ -249093,11 +249240,11 @@ class BGFBReader {
         const xyzArray = header.fitPointsArray();
         if (xyzArray instanceof Float64Array) {
             const knots = header.knotsArray();
-            const options = new _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_4__.InterpolationCurve3dOptions(_geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_5__.Point3dArray.clonePoint3dArray(xyzArray), knots ? _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_5__.NumberArray.create(knots) : undefined);
+            const options = new _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_5__.InterpolationCurve3dOptions(_geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_6__.Point3dArray.clonePoint3dArray(xyzArray), knots ? _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_6__.NumberArray.create(knots) : undefined);
             const startTangent = header.startTangent();
             const endTangent = header.endTangent();
-            options.captureOptionalProps(header.order(), header.closed(), header.isChordLenKnots(), header.isColinearTangents(), header.isChordLenTangents(), header.isNaturalTangents(), startTangent !== null ? _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(startTangent.x(), startTangent.y(), startTangent.z()) : undefined, endTangent !== null ? _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(endTangent.x(), endTangent.y(), endTangent.z()) : undefined);
-            return _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_4__.InterpolationCurve3d.createCapture(options);
+            options.captureOptionalProps(header.order(), header.closed(), header.isChordLenKnots(), header.isColinearTangents(), header.isChordLenTangents(), header.isNaturalTangents(), startTangent !== null ? _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(startTangent.x(), startTangent.y(), startTangent.z()) : undefined, endTangent !== null ? _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(endTangent.x(), endTangent.y(), endTangent.z()) : undefined);
+            return _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_5__.InterpolationCurve3d.createCapture(options);
         }
         return undefined;
     }
@@ -249108,8 +249255,8 @@ class BGFBReader {
     readAkimaCurve3d(header) {
         const xyzArray = header.pointsArray();
         if (xyzArray instanceof Float64Array) {
-            const options = new _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_7__.AkimaCurve3dOptions(_geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_5__.Point3dArray.clonePoint3dArray(xyzArray));
-            return _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_7__.AkimaCurve3d.createCapture(options);
+            const options = new _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_8__.AkimaCurve3dOptions(_geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_6__.Point3dArray.clonePoint3dArray(xyzArray));
+            return _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_8__.AkimaCurve3d.createCapture(options);
         }
         return undefined;
     }
@@ -249126,17 +249273,17 @@ class BGFBReader {
         const closed = header.closed();
         if (xyzArray !== null && knots !== null) {
             const numPoles = Math.floor(xyzArray.length / 3);
-            const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__.SerializationHelpers.createBSplineCurveData(xyzArray, 3, knots, numPoles, order);
+            const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.createBSplineCurveData(xyzArray, 3, knots, numPoles, order);
             if (closed)
                 myData.params.closed = true;
             if (weightsArray === null) {
-                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__.SerializationHelpers.Import.prepareBSplineCurveData(myData))
-                    newCurve = _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_8__.BSplineCurve3d.create(myData.poles, myData.params.knots, myData.params.order);
+                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.Import.prepareBSplineCurveData(myData))
+                    newCurve = _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_9__.BSplineCurve3d.create(myData.poles, myData.params.knots, myData.params.order);
             }
             else {
                 myData.weights = weightsArray;
-                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_2__.SerializationHelpers.Import.prepareBSplineCurveData(myData, { jsonPoles: false }))
-                    newCurve = _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_9__.BSplineCurve3dH.create({ xyz: myData.poles, weights: myData.weights }, myData.params.knots, myData.params.order);
+                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.Import.prepareBSplineCurveData(myData, { jsonPoles: false }))
+                    newCurve = _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_10__.BSplineCurve3dH.create({ xyz: myData.poles, weights: myData.weights }, myData.params.knots, myData.params.order);
             }
             if (undefined !== newCurve) {
                 if (undefined !== myData.params.wrapMode)
@@ -249160,17 +249307,17 @@ class BGFBReader {
             const bearing0Radians = detailHeader.bearing0Radians();
             const bearing1Radians = detailHeader.bearing1Radians();
             const fbTransform = detailHeader.transform();
-            const localToWorld = fbTransform ? _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_10__.Transform.createRowValues(fbTransform.axx(), fbTransform.axy(), fbTransform.axz(), fbTransform.axw(), fbTransform.ayx(), fbTransform.ayy(), fbTransform.ayz(), fbTransform.ayw(), fbTransform.azx(), fbTransform.azy(), fbTransform.azz(), fbTransform.azw()) :
-                _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_10__.Transform.createIdentity();
-            const activeFractionInterval = _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_11__.Segment1d.create(detailHeader.fractionA(), detailHeader.fractionB());
+            const localToWorld = fbTransform ? _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_11__.Transform.createRowValues(fbTransform.axx(), fbTransform.axy(), fbTransform.axz(), fbTransform.axw(), fbTransform.ayx(), fbTransform.ayy(), fbTransform.ayz(), fbTransform.ayw(), fbTransform.azx(), fbTransform.azy(), fbTransform.azz(), fbTransform.azw()) :
+                _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_11__.Transform.createIdentity();
+            const activeFractionInterval = _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_12__.Segment1d.create(detailHeader.fractionA(), detailHeader.fractionB());
             if (!directDetailHeader) {
-                const integratedSpiral = _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__.IntegratedSpiral3d.createRadiusRadiusBearingBearing(_geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_11__.Segment1d.create(_curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__.IntegratedSpiral3d.curvatureToRadius(curvature0), _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__.IntegratedSpiral3d.curvatureToRadius(curvature1)), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_13__.AngleSweep.createStartEndRadians(bearing0Radians, bearing1Radians), activeFractionInterval, localToWorld, spiralTypeName);
+                const integratedSpiral = _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_13__.IntegratedSpiral3d.createRadiusRadiusBearingBearing(_geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_12__.Segment1d.create(_curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_13__.IntegratedSpiral3d.curvatureToRadius(curvature0), _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_13__.IntegratedSpiral3d.curvatureToRadius(curvature1)), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_14__.AngleSweep.createStartEndRadians(bearing0Radians, bearing1Radians), activeFractionInterval, localToWorld, spiralTypeName);
                 if (integratedSpiral)
                     return integratedSpiral;
-                const radius0 = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_14__.TransitionSpiral3d.curvatureToRadius(curvature0);
-                const radius1 = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_14__.TransitionSpiral3d.curvatureToRadius(curvature1);
-                const arcLength = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_14__.TransitionSpiral3d.radiusRadiusSweepRadiansToArcLength(radius0, radius1, bearing1Radians - bearing0Radians);
-                const directSpiral = _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_15__.DirectSpiral3d.createFromLengthAndRadius(spiralTypeName, radius0, radius1, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_16__.Angle.createRadians(bearing0Radians), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_16__.Angle.createRadians(bearing1Radians), arcLength, activeFractionInterval, localToWorld);
+                const radius0 = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_15__.TransitionSpiral3d.curvatureToRadius(curvature0);
+                const radius1 = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_15__.TransitionSpiral3d.curvatureToRadius(curvature1);
+                const arcLength = _curve_spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_15__.TransitionSpiral3d.radiusRadiusSweepRadiansToArcLength(radius0, radius1, bearing1Radians - bearing0Radians);
+                const directSpiral = _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_16__.DirectSpiral3d.createFromLengthAndRadius(spiralTypeName, radius0, radius1, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_17__.Angle.createRadians(bearing0Radians), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_17__.Angle.createRadians(bearing1Radians), arcLength, activeFractionInterval, localToWorld);
                 if (directSpiral)
                     return directSpiral;
             }
@@ -249183,42 +249330,42 @@ class BGFBReader {
      */
     readCurvePrimitiveFromVariant(variant) {
         const geometryType = variant.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagLineSegment) {
-            const offsetToLineSegment = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.LineSegment());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagLineSegment) {
+            const offsetToLineSegment = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.LineSegment());
             const offsetToCoordinates = offsetToLineSegment.segment();
-            return _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_17__.LineSegment3d.createXYZXYZ(offsetToCoordinates.point0X(), offsetToCoordinates.point0Y(), offsetToCoordinates.point0Z(), offsetToCoordinates.point1X(), offsetToCoordinates.point1Y(), offsetToCoordinates.point1Z());
+            return _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d.createXYZXYZ(offsetToCoordinates.point0X(), offsetToCoordinates.point0Y(), offsetToCoordinates.point0Z(), offsetToCoordinates.point1X(), offsetToCoordinates.point1Y(), offsetToCoordinates.point1Z());
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagEllipticArc) {
-            const offsetToEllipticArc = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.EllipticArc());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagEllipticArc) {
+            const offsetToEllipticArc = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.EllipticArc());
             const offsetToCoordinates = offsetToEllipticArc.arc();
-            return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_18__.Arc3d.createXYZXYZXYZ(offsetToCoordinates.centerX(), offsetToCoordinates.centerY(), offsetToCoordinates.centerZ(), offsetToCoordinates.vector0X(), offsetToCoordinates.vector0Y(), offsetToCoordinates.vector0Z(), offsetToCoordinates.vector90X(), offsetToCoordinates.vector90Y(), offsetToCoordinates.vector90Z(), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_13__.AngleSweep.createStartSweepRadians(offsetToCoordinates.startRadians(), offsetToCoordinates?.sweepRadians()));
+            return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_19__.Arc3d.createXYZXYZXYZ(offsetToCoordinates.centerX(), offsetToCoordinates.centerY(), offsetToCoordinates.centerZ(), offsetToCoordinates.vector0X(), offsetToCoordinates.vector0Y(), offsetToCoordinates.vector0Z(), offsetToCoordinates.vector90X(), offsetToCoordinates.vector90Y(), offsetToCoordinates.vector90Z(), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_14__.AngleSweep.createStartSweepRadians(offsetToCoordinates.startRadians(), offsetToCoordinates?.sweepRadians()));
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagLineString) {
-            const offsetToLineString = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.LineString());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagLineString) {
+            const offsetToLineString = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.LineString());
             const numCoordinates = offsetToLineString.pointsLength();
-            const result = _curve_LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            const result = _curve_LineString3d__WEBPACK_IMPORTED_MODULE_20__.LineString3d.create();
             for (let i = 0; i + 2 < numCoordinates; i += 3) {
                 result.packedPoints.pushXYZ(offsetToLineString.points(i), offsetToLineString.points(i + 1), offsetToLineString.points(i + 2));
             }
             return result;
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagBsplineCurve) {
-            const offsetToBCurve = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.BsplineCurve());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagBsplineCurve) {
+            const offsetToBCurve = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.BsplineCurve());
             if (offsetToBCurve !== null)
                 return this.readBSplineCurve(offsetToBCurve);
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagTransitionSpiral) {
-            const offsetToTransitionSpiralTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.TransitionSpiral());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagTransitionSpiral) {
+            const offsetToTransitionSpiralTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.TransitionSpiral());
             if (offsetToTransitionSpiralTable !== null)
                 return this.readTransitionSpiral(offsetToTransitionSpiralTable);
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagInterpolationCurve) {
-            const offsetToInterpolationCurveTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.InterpolationCurve());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagInterpolationCurve) {
+            const offsetToInterpolationCurveTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.InterpolationCurve());
             if (offsetToInterpolationCurveTable !== null)
                 return this.readInterpolationCurve3d(offsetToInterpolationCurveTable);
         }
-        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagAkimaCurve) {
-            const offsetToAkimaCurveTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.AkimaCurve());
+        else if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagAkimaCurve) {
+            const offsetToAkimaCurveTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.AkimaCurve());
             if (offsetToAkimaCurveTable !== null)
                 return this.readAkimaCurve3d(offsetToAkimaCurveTable);
         }
@@ -249230,34 +249377,28 @@ class BGFBReader {
      */
     readPointStringFromVariant(variant) {
         const geometryType = variant.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagPointString) {
-            const offsetToLineString = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.PointString());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagPointString) {
+            const offsetToLineString = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.PointString());
             const numCoordinates = offsetToLineString.pointsLength();
-            const result = _curve_PointString3d__WEBPACK_IMPORTED_MODULE_20__.PointString3d.create();
+            const result = _curve_PointString3d__WEBPACK_IMPORTED_MODULE_21__.PointString3d.create();
             for (let i = 0; i + 2 < numCoordinates; i += 3) {
-                result.points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(offsetToLineString.points(i), offsetToLineString.points(i + 1), offsetToLineString.points(i + 2)));
+                result.points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(offsetToLineString.points(i), offsetToLineString.points(i + 1), offsetToLineString.points(i + 2)));
             }
             return result;
         }
         return undefined;
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel data for a mesh */
     readPolyfaceAuxChannelData(channelDataHeader) {
         if (channelDataHeader !== null) {
             const input = channelDataHeader.input();
             const values = channelDataHeader.valuesArray();
             if (values !== null)
-                return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_21__.AuxChannelData(input, values);
+                return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_22__.AuxChannelData(input, values);
         }
         return undefined;
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract auxData channel for a mesh */
     readPolyfaceAuxChannel(channelHeader) {
         if (channelHeader) {
             const dataType = channelHeader.dataType();
@@ -249270,43 +249411,107 @@ class BGFBReader {
                 if (channelData)
                     channelDataArray.push(channelData);
             }
-            return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_21__.AuxChannel(channelDataArray, dataType, name ? name : undefined, inputName ? inputName : undefined);
+            return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_22__.AuxChannel(channelDataArray, dataType, name ? name : undefined, inputName ? inputName : undefined);
         }
         return undefined;
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
-    readPolyfaceAuxData(auxDataHeader) {
-        if (auxDataHeader) {
-            const channelsLength = auxDataHeader.channelsLength();
-            const indicesArray = auxDataHeader.indicesArray();
-            const indices = [];
-            const channels = [];
-            if (null !== indicesArray) {
-                for (const i of indicesArray)
-                    indices.push(i);
-            }
-            if (0 !== channelsLength) {
-                for (let i = 0; i < channelsLength; i++) {
-                    const channelHeader = auxDataHeader.channels(i);
-                    const channelContent = this.readPolyfaceAuxChannel(channelHeader);
-                    if (channelContent)
-                        channels.push(channelContent);
-                }
-            }
-            return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_21__.PolyfaceAuxData(channels, indices);
+    /** Compute the number of logical entries in every flat data array in the AuxData */
+    static channelDataLength(fbAuxData) {
+        if (fbAuxData.channelsLength() <= 0)
+            return 0;
+        const fbChannel0 = nullToUndefined(fbAuxData.channels(0));
+        if (!fbChannel0)
+            return 0;
+        const numChannel0Data = fbChannel0.dataLength();
+        if (numChannel0Data <= 0)
+            return 0;
+        const fbChannel0Data0 = nullToUndefined(fbChannel0.data(0));
+        if (!fbChannel0Data0)
+            return 0;
+        const numChannelDataValues = fbChannel0Data0.valuesLength();
+        if (numChannelDataValues <= 0)
+            return 0;
+        return numChannelDataValues / _polyface_AuxData__WEBPACK_IMPORTED_MODULE_22__.AuxChannel.entriesPerValue(fbChannel0.dataType());
+    }
+    /** Examine int array for range and zero count  */
+    countIntArray(ints) {
+        let min = Infinity;
+        let max = -Infinity;
+        let numZeroes = 0;
+        for (const i of ints) {
+            if (min > i)
+                min = i;
+            if (max < i)
+                max = i;
+            if (0 === i)
+                ++numZeroes;
+        }
+        return { min, max, numZeroes };
+    }
+    /**
+     * Extract auxData for a mesh.
+     * Typescript object format for Polyface/PolyfaceAuxData indices is 0-based, unterminated.
+     * FlatBuffer format for Polyface/PolyfaceAuxData indices is 1-based, 0-terminated/padded.
+     * Typescript API previously wrote FlatBuffer PolyfaceAuxData indices as 0-based, unterminated;
+     * heuristics are used herein to identify this legacy format so it can still be read.
+     */
+    readPolyfaceAuxData(fbPolyface, fbAuxData) {
+        if (!fbPolyface || !fbAuxData)
+            return undefined;
+        const fbPointIndices = nullToUndefined(fbPolyface.pointIndexArray());
+        const fbAuxIndices = nullToUndefined(fbAuxData.indicesArray());
+        const numChannels = fbAuxData.channelsLength();
+        const fbNumData = BGFBReader.channelDataLength(fbAuxData);
+        if (!fbPointIndices || !fbPointIndices.length || !fbAuxIndices || !fbAuxIndices.length || numChannels <= 0 || fbNumData <= 0)
+            return undefined;
+        const numPerFace = fbPolyface.numPerFace();
+        // HEURISTICS to detect legacy AuxData indices, previously mistakenly serialized by BGFBWriter.writePolyfaceAsFBVariantGeometry as 0-based unblocked indices
+        let isLegacy = false;
+        const pointIndicesPadCount = fbPointIndices.filter((index) => index === 0).length;
+        if (numPerFace > 1) {
+            const auxIndexCounts = this.countIntArray(fbAuxIndices);
+            if (auxIndexCounts.max > fbNumData) // auxIndices invalid
+                return undefined;
+            if (auxIndexCounts.max === fbNumData) // auxIndices 1-based
+                isLegacy = false;
+            else if (auxIndexCounts.max <= 0 || auxIndexCounts.min < 0) // auxIndices 1-based (signed)
+                isLegacy = false;
+            else if (auxIndexCounts.min === 0) // auxIndices likely legacy 0-based index, but could be modern with padding
+                isLegacy = pointIndicesPadCount !== auxIndexCounts.numZeroes;
+            else if (auxIndexCounts.min > 0) // auxIndices likely modern without padding, but could be legacy if first datum not indexed
+                isLegacy = pointIndicesPadCount > 0;
         }
-        return undefined;
+        else {
+            isLegacy = (fbAuxIndices.length < fbPointIndices.length) && (fbAuxIndices.length + pointIndicesPadCount === fbPointIndices.length);
+        }
+        if (!isLegacy && fbAuxIndices.length !== fbPointIndices.length)
+            return undefined; // auxIndices invalid
+        const indices = [];
+        if (isLegacy)
+            _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesWithExternalBlocking(fbAuxIndices, fbPointIndices, numPerFace, (i0) => { indices.push(i0); });
+        else
+            _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(fbAuxIndices, numPerFace, (i0) => { indices.push(i0); });
+        if (indices.length + pointIndicesPadCount !== fbPointIndices.length)
+            return undefined;
+        const maxIndex = Math.max(...indices);
+        const channels = [];
+        for (let i = 0; i < numChannels; i++) {
+            const channelHeader = fbAuxData.channels(i);
+            const channelContent = this.readPolyfaceAuxChannel(channelHeader);
+            if (channelContent) {
+                if (maxIndex >= channelContent.valueCount)
+                    return undefined; // invalid index
+                channels.push(channelContent);
+            }
+        }
+        if (!channels.length)
+            return undefined;
+        return new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_22__.PolyfaceAuxData(channels, indices);
     }
-    /**
-   * Extract auxData for a mesh
-   * @param variant read position in the flat buffer.
-   */
+    /** Extract tagged numeric data for a mesh */
     readTaggedNumericData(accessor) {
         if (accessor) {
-            const taggedNumericData = new _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_22__.TaggedNumericData(accessor.tagA(), accessor.tagB());
+            const taggedNumericData = new _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_23__.TaggedNumericData(accessor.tagA(), accessor.tagB());
             const intDataArray = nullToUndefined(accessor.intDataArray());
             const doubleDataArray = nullToUndefined(accessor.doubleDataArray());
             if (intDataArray) {
@@ -249324,13 +249529,13 @@ class BGFBReader {
         return undefined;
     }
     /**
-   * Extract a mesh
-   * @param variant read position in the flat buffer.
-   */
+     * Extract a mesh
+     * @param variant read position in the flat buffer.
+     */
     readPolyfaceFromVariant(variant) {
         const geometryType = variant.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagPolyface) {
-            const polyfaceHeader = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.Polyface());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagPolyface) {
+            const polyfaceHeader = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.Polyface());
             if (polyfaceHeader) {
                 const twoSided = polyfaceHeader.twoSided();
                 const expectedClosure = polyfaceHeader.expectedClosure();
@@ -249345,59 +249550,35 @@ class BGFBReader {
                 const normalIndexI32 = nullToUndefined(polyfaceHeader.normalIndexArray());
                 const colorIndexI32 = nullToUndefined(polyfaceHeader.colorIndexArray());
                 const taggedNumericDataOffset = polyfaceHeader.taggedNumericData();
+                (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(meshStyle === 1, "Unrecognized flatbuffer mesh style");
+                // The flatbuffer data is one based.
+                // If numPerFace is less than 2, facets are variable size and zero terminated
+                // If numPerFace is 2 or more, indices are blocked
                 if (meshStyle === 1 && pointF64 && pointIndexI32) {
-                    const polyface = _polyface_Polyface__WEBPACK_IMPORTED_MODULE_23__.IndexedPolyface.create(normalF64 !== undefined, paramF64 !== undefined, intColorU32 !== undefined, twoSided);
+                    const polyface = _polyface_Polyface__WEBPACK_IMPORTED_MODULE_24__.IndexedPolyface.create();
+                    polyface.twoSided = twoSided;
                     polyface.expectedClosure = expectedClosure;
-                    for (let i = 0; i + 2 < pointF64?.length; i += 3)
-                        polyface.data.point.pushXYZ(pointF64[i], pointF64[i + 1], pointF64[i + 2]);
-                    if (paramF64) {
-                        for (let i = 0; i + 1 < paramF64?.length; i += 2)
-                            polyface.data.param.pushXY(paramF64[i], paramF64[i + 1]);
+                    if (normalF64 && normalIndexI32) {
+                        for (let i = 0; i + 2 < normalF64.length; i += 3)
+                            polyface.addNormalXYZ(normalF64[i], normalF64[i + 1], normalF64[i + 2]);
+                        _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(normalIndexI32, numPerFace, (i) => { polyface.addNormalIndex(i); });
                     }
-                    if (normalF64) {
-                        for (let i = 0; i + 2 < normalF64?.length; i += 3)
-                            polyface.data.normal.pushXYZ(normalF64[i], normalF64[i + 1], normalF64[i + 2]);
+                    if (paramF64 && paramIndexI32) {
+                        for (let i = 0; i + 1 < paramF64.length; i += 2)
+                            polyface.addParamUV(paramF64[i], paramF64[i + 1]);
+                        _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(paramIndexI32, numPerFace, (i) => { polyface.addParamIndex(i); });
                     }
-                    if (intColorU32) {
+                    if (intColorU32 && colorIndexI32) {
                         for (const c of intColorU32)
-                            polyface.data.color.push(c);
-                    }
-                    // The flatbuffer data is one based.
-                    // If numPerFace is less than 2, facets are variable size and zero terminated
-                    // If numPerFace is 2 or more, indices are blocked
-                    const numIndex = pointIndexI32.length;
-                    const addIndicesInBlock = (k0, k1) => {
-                        for (let k = k0; k < k1; k++) {
-                            const q = pointIndexI32[k];
-                            polyface.addPointIndex(Math.abs(q) - 1, q > 0);
-                            if (normalF64 && normalIndexI32) {
-                                polyface.addNormalIndex(Math.abs(normalIndexI32[k]) - 1);
-                            }
-                            if (paramF64 && paramIndexI32) {
-                                polyface.addParamIndex(Math.abs(paramIndexI32[k]) - 1);
-                            }
-                            if (intColorU32 && colorIndexI32) {
-                                polyface.addColorIndex(Math.abs(colorIndexI32[k]) - 1);
-                            }
-                        }
-                    };
-                    if (numPerFace > 1) {
-                        for (let i0 = 0; i0 + numPerFace <= numIndex; i0 += numPerFace) {
-                            addIndicesInBlock(i0, i0 + numPerFace);
-                            polyface.terminateFacet(true);
-                        }
+                            polyface.addColor(c);
+                        _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(colorIndexI32, numPerFace, (i) => { polyface.addColorIndex(i); });
                     }
-                    else {
-                        let i0 = 0;
-                        for (let i1 = i0; i1 < numIndex; i1++) {
-                            if (pointIndexI32[i1] === 0) {
-                                addIndicesInBlock(i0, i1);
-                                polyface.terminateFacet(true);
-                                i0 = i1 + 1;
-                            }
-                        }
-                    }
-                    polyface.data.auxData = this.readPolyfaceAuxData(polyfaceHeader.auxData());
+                    for (let i = 0; i + 2 < pointF64.length; i += 3)
+                        polyface.addPointXYZ(pointF64[i], pointF64[i + 1], pointF64[i + 2]);
+                    _SerializationHelpers__WEBPACK_IMPORTED_MODULE_3__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(pointIndexI32, numPerFace, (i, v) => { polyface.addPointIndex(i, v); }, () => { polyface.terminateFacet(false); });
+                    if (!polyface.validateAllIndices())
+                        return undefined;
+                    polyface.data.auxData = this.readPolyfaceAuxData(polyfaceHeader, polyfaceHeader.auxData());
                     if (taggedNumericDataOffset) {
                         const taggedNumericDataAccessor = nullToUndefined(taggedNumericDataOffset);
                         if (taggedNumericDataAccessor !== undefined) {
@@ -249437,8 +249618,8 @@ class BGFBReader {
    */
     readCurveCollectionFromVariantGeometry(variant) {
         const geometryType = variant.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagCurveVector) {
-            const cvTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.CurveVector());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagCurveVector) {
+            const cvTable = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.CurveVector());
             return this.readCurveCollectionFromCurveVectorTable(cvTable);
         }
         return undefined;
@@ -249449,66 +249630,66 @@ class BGFBReader {
    */
     readSolidPrimitiveFromVariant(variant) {
         const geometryType = variant.geometryType();
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnBox) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnBox());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnBox) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnBox());
             const detail = header.detail();
-            return _solid_Box__WEBPACK_IMPORTED_MODULE_24__.Box.createDgnBox(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(detail.baseOriginX(), detail.baseOriginY(), detail.baseOriginZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vectorXX(), detail.vectorXY(), detail.vectorXZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vectorYX(), detail.vectorYY(), detail.vectorYZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(detail.topOriginX(), detail.topOriginY(), detail.topOriginZ()), detail.baseX(), detail.baseY(), detail.topX(), detail.topY(), detail.capped());
+            return _solid_Box__WEBPACK_IMPORTED_MODULE_25__.Box.createDgnBox(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(detail.baseOriginX(), detail.baseOriginY(), detail.baseOriginZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vectorXX(), detail.vectorXY(), detail.vectorXZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vectorYX(), detail.vectorYY(), detail.vectorYZ()), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(detail.topOriginX(), detail.topOriginY(), detail.topOriginZ()), detail.baseX(), detail.baseY(), detail.topX(), detail.topY(), detail.capped());
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnSphere) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnSphere());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnSphere) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnSphere());
             const detail = header.detail();
             const lToWDetail = detail.localToWorld();
-            const localToWorld = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_10__.Transform.createRowValues(lToWDetail.axx(), lToWDetail.axy(), lToWDetail.axz(), lToWDetail.axw(), lToWDetail.ayx(), lToWDetail.ayy(), lToWDetail.ayz(), lToWDetail.ayw(), lToWDetail.azx(), lToWDetail.azy(), lToWDetail.azz(), lToWDetail.azw());
-            return _solid_Sphere__WEBPACK_IMPORTED_MODULE_25__.Sphere.createEllipsoid(localToWorld, _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_13__.AngleSweep.createStartSweepRadians(detail.startLatitudeRadians(), detail.latitudeSweepRadians()), detail.capped());
+            const localToWorld = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_11__.Transform.createRowValues(lToWDetail.axx(), lToWDetail.axy(), lToWDetail.axz(), lToWDetail.axw(), lToWDetail.ayx(), lToWDetail.ayy(), lToWDetail.ayz(), lToWDetail.ayw(), lToWDetail.azx(), lToWDetail.azy(), lToWDetail.azz(), lToWDetail.azw());
+            return _solid_Sphere__WEBPACK_IMPORTED_MODULE_26__.Sphere.createEllipsoid(localToWorld, _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_14__.AngleSweep.createStartSweepRadians(detail.startLatitudeRadians(), detail.latitudeSweepRadians()), detail.capped());
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnCone) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnCone());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnCone) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnCone());
             const detail = header.detail();
-            const centerA = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(detail.centerAX(), detail.centerAY(), detail.centerAZ());
-            const centerB = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(detail.centerBX(), detail.centerBY(), detail.centerBZ());
-            const vector0 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vector0X(), detail.vector0Y(), detail.vector0Z());
-            const vector90 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vector90X(), detail.vector90Y(), detail.vector90Z());
+            const centerA = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(detail.centerAX(), detail.centerAY(), detail.centerAZ());
+            const centerB = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(detail.centerBX(), detail.centerBY(), detail.centerBZ());
+            const vector0 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vector0X(), detail.vector0Y(), detail.vector0Z());
+            const vector90 = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vector90X(), detail.vector90Y(), detail.vector90Z());
             const radiusA = detail.radiusA();
             const radiusB = detail.radiusB();
-            return _solid_Cone__WEBPACK_IMPORTED_MODULE_26__.Cone.createBaseAndTarget(centerA, centerB, vector0, vector90, radiusA, radiusB, detail.capped());
+            return _solid_Cone__WEBPACK_IMPORTED_MODULE_27__.Cone.createBaseAndTarget(centerA, centerB, vector0, vector90, radiusA, radiusB, detail.capped());
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnTorusPipe) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnTorusPipe());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnTorusPipe) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnTorusPipe());
             const detail = header.detail();
-            const center = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Point3d.create(detail.centerX(), detail.centerY(), detail.centerZ());
-            const vectorX = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vectorXX(), detail.vectorXY(), detail.vectorXZ());
-            const vectorY = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(detail.vectorYX(), detail.vectorYY(), detail.vectorYZ());
+            const center = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Point3d.create(detail.centerX(), detail.centerY(), detail.centerZ());
+            const vectorX = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vectorXX(), detail.vectorXY(), detail.vectorXZ());
+            const vectorY = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(detail.vectorYX(), detail.vectorYY(), detail.vectorYZ());
             const sweepRadians = detail.sweepRadians();
             const majorRadius = detail.majorRadius();
             const minorRadius = detail.minorRadius();
-            return _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_27__.TorusPipe.createDgnTorusPipe(center, vectorX, vectorY, majorRadius, minorRadius, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_16__.Angle.createRadians(sweepRadians), detail.capped());
+            return _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_28__.TorusPipe.createDgnTorusPipe(center, vectorX, vectorY, majorRadius, minorRadius, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_17__.Angle.createRadians(sweepRadians), detail.capped());
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnExtrusion) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnExtrusion());
-            const dVector = new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DVector3d();
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnExtrusion) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnExtrusion());
+            const dVector = new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DVector3d();
             header.extrusionVector(dVector);
-            const extrusionVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_6__.Vector3d.create(dVector.x(), dVector.y(), dVector.z());
+            const extrusionVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_7__.Vector3d.create(dVector.x(), dVector.y(), dVector.z());
             const baseCurve = header.baseCurve();
             if (baseCurve !== null) {
                 const contour = this.readCurveCollectionFromCurveVectorTable(baseCurve);
-                return _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_28__.LinearSweep.create(contour, extrusionVector, header.capped());
+                return _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_29__.LinearSweep.create(contour, extrusionVector, header.capped());
             }
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnRotationalSweep) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnRotationalSweep());
-            const dAxis = new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DRay3d();
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnRotationalSweep) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnRotationalSweep());
+            const dAxis = new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DRay3d();
             header.axis(dAxis);
-            const axis = _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_29__.Ray3d.createXYZUVW(dAxis.x(), dAxis.y(), dAxis.z(), dAxis.ux(), dAxis.uy(), dAxis.uz());
-            const sweepAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_16__.Angle.createRadians(header.sweepRadians());
+            const axis = _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_30__.Ray3d.createXYZUVW(dAxis.x(), dAxis.y(), dAxis.z(), dAxis.ux(), dAxis.uy(), dAxis.uz());
+            const sweepAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_17__.Angle.createRadians(header.sweepRadians());
             // const numVRules = header.numVRules();
             const baseCurve = header.baseCurve();
             if (baseCurve !== null) {
                 const contour = this.readCurveCollectionFromCurveVectorTable(baseCurve);
-                return _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_30__.RotationalSweep.create(contour, axis, sweepAngle, header.capped());
+                return _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_31__.RotationalSweep.create(contour, axis, sweepAngle, header.capped());
             }
         }
-        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnRuledSweep) {
-            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.DgnRuledSweep());
+        if (geometryType === _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnRuledSweep) {
+            const header = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.DgnRuledSweep());
             const numCurves = header.curvesLength();
             const contours = [];
             for (let i = 0; i < numCurves; i++) {
@@ -249520,7 +249701,7 @@ class BGFBReader {
                 }
             }
             if (contours.length > 0) {
-                return _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_31__.RuledSweep.create(contours, header.capped());
+                return _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_32__.RuledSweep.create(contours, header.capped());
             }
         }
         return undefined;
@@ -249532,43 +249713,43 @@ class BGFBReader {
     readGeometryQueryFromVariant(variant) {
         const rootType = variant.geometryType();
         switch (rootType) {
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagLineSegment:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagLineString:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagEllipticArc:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagBsplineCurve:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagTransitionSpiral:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagInterpolationCurve:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagAkimaCurve:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagLineSegment:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagLineString:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagEllipticArc:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagBsplineCurve:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagTransitionSpiral:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagInterpolationCurve:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagAkimaCurve:
                 {
                     return this.readCurvePrimitiveFromVariant(variant);
                 }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagCurveVector:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagCurveVector:
                 {
                     return this.readCurveCollectionFromVariantGeometry(variant);
                 }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagPolyface:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagPolyface:
                 {
                     return this.readPolyfaceFromVariant(variant);
                 }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnBox:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnCone:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnTorusPipe:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnSphere:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnExtrusion:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnRotationalSweep:
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagDgnRuledSweep:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnBox:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnCone:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnTorusPipe:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnSphere:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnExtrusion:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnRotationalSweep:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagDgnRuledSweep:
                 {
                     return this.readSolidPrimitiveFromVariant(variant);
                 }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagVectorOfVariantGeometry:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagVectorOfVariantGeometry:
                 {
                     const geometry = [];
-                    const offsetToVectorOfVariantGeometry = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VectorOfVariantGeometry());
+                    const offsetToVectorOfVariantGeometry = variant.geometry(new _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VectorOfVariantGeometry());
                     for (let i = 0; i < offsetToVectorOfVariantGeometry.membersLength(); i++) {
                         const child = offsetToVectorOfVariantGeometry.members(i);
                         if (child !== null) {
                             const childGeometry = this.readGeometryQueryFromVariant(child);
-                            if (childGeometry instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_32__.GeometryQuery) {
+                            if (childGeometry instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_33__.GeometryQuery) {
                                 geometry.push(childGeometry);
                             }
                             else if (Array.isArray(childGeometry)) {
@@ -249578,10 +249759,10 @@ class BGFBReader {
                     }
                     return geometry;
                 }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagBsplineSurface: {
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagBsplineSurface: {
                 return this.readBSplineSurfaceFromVariant(variant);
             }
-            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometryUnion.tagPointString:
+            case _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometryUnion.tagPointString:
                 {
                     return this.readPointStringFromVariant(variant);
                 }
@@ -249602,7 +249783,7 @@ class BGFBReader {
                     return undefined;
             newByteBuffer.setPosition(signature.length);
         }
-        const root = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_1__.BGFBAccessors.VariantGeometry.getRootAsVariantGeometry(newByteBuffer);
+        const root = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_2__.BGFBAccessors.VariantGeometry.getRootAsVariantGeometry(newByteBuffer);
         const reader = new BGFBReader();
         return reader.readGeometryQueryFromVariant(root);
     }
@@ -249618,14 +249799,14 @@ function nullToUndefined(data) {
 }
 function createTypedCurveCollection(collectionType) {
     if (collectionType === 1)
-        return new _curve_Path__WEBPACK_IMPORTED_MODULE_33__.Path();
+        return new _curve_Path__WEBPACK_IMPORTED_MODULE_34__.Path();
     if (collectionType === 2 || collectionType === 3)
-        return new _curve_Loop__WEBPACK_IMPORTED_MODULE_34__.Loop();
+        return new _curve_Loop__WEBPACK_IMPORTED_MODULE_35__.Loop();
     if (collectionType === 4)
-        return new _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_35__.ParityRegion();
+        return new _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_36__.ParityRegion();
     if (collectionType === 5)
-        return new _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_36__.UnionRegion();
-    return new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_37__.BagOfCurves();
+        return new _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_37__.UnionRegion();
+    return new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_38__.BagOfCurves();
 }
 /**
  * mappings between typescript spiral type strings and native integers.
@@ -249643,7 +249824,7 @@ class DgnSpiralTypeQueries {
     /** Convert typescript string to native integer type */
     static stringToTypeCode(s, defaultToClothoid = true) {
         for (const entry of DgnSpiralTypeQueries.spiralTypeCodeMap) {
-            if (_Geometry__WEBPACK_IMPORTED_MODULE_38__.Geometry.equalStringNoCase(s, entry[1]))
+            if (_Geometry__WEBPACK_IMPORTED_MODULE_39__.Geometry.equalStringNoCase(s, entry[1]))
                 return entry[0];
         }
         return defaultToClothoid ? 10 : undefined;
@@ -250147,14 +250328,15 @@ class BGFBWriter {
         }
         return undefined;
     }
-    writePolyfaceAuxDataAsFBVariantGeometry(data) {
+    writePolyfaceAuxDataAsFBVariantGeometry(mesh, data) {
         if (data instanceof _polyface_AuxData__WEBPACK_IMPORTED_MODULE_31__.PolyfaceAuxData) {
             const channelOffsets = [];
-            for (const channel of data.channels) {
+            for (const channel of data.channels)
                 channelOffsets.push(this.writePolyfaceAuxChannelAsFBVariantGeometry(channel));
-            }
             const channelOffsetsOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.PolyfaceAuxChannel.createDataVector(this.builder, channelOffsets);
-            const indicesOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.PolyfaceAuxData.createIndicesVector(this.builder, data.indices);
+            const indexArray = [];
+            this.fillOneBasedIndexArray(mesh, data.indices, undefined, 0, indexArray);
+            const indicesOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.PolyfaceAuxData.createIndicesVector(this.builder, indexArray);
             return _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.PolyfaceAuxData.createPolyfaceAuxData(this.builder, indicesOffset, channelOffsetsOffset);
         }
         return undefined;
@@ -250182,8 +250364,8 @@ class BGFBWriter {
             let paramOffset = 0;
             let auxDataOffset = 0;
             let taggedNumericDataOffset = 0;
-            const meshStyle = 1; // That is  . . . MESH_ELM_STYLE_INDEXED_FACE_LOOPS (and specifically, variable size with with 0 terminators)
-            const numPerFace = 0;
+            const meshStyle = 1; // That is  . . . MESH_ELM_STYLE_INDEXED_FACE_LOOPS
+            const numPerFace = 0; // specifically, variable size with 0 terminators
             this.fillOneBasedIndexArray(mesh, mesh.data.pointIndex, mesh.data.edgeVisible, 0, indexArray);
             const twoSided = mesh.twoSided;
             const pointIndexOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.Polyface.createPointIndexVector(this.builder, indexArray);
@@ -250202,12 +250384,6 @@ class BGFBWriter {
             if (mesh.data.color !== undefined && mesh.data.color.length > 0) {
                 intColorOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.Polyface.createIntColorVector(this.builder, mesh.data.color);
             }
-            /*
-                  if (mesh.data.face !== undefined && mesh.data.face.length > 0) {
-                    this.writeOneBasedIndexArray(mesh, mesh.data.face, undefined, 0, indexArray);
-                    BGFBAccessors.Polyface.createFaceDataVector(this.builder, indexArray);
-                  }
-              */
             if (mesh.data.normal) {
                 copyToPackedNumberArray(numberArray, mesh.data.normal.float64Data(), mesh.data.normal.float64Length);
                 normalOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.Polyface.createNormalVector(this.builder, numberArray);
@@ -250216,12 +250392,12 @@ class BGFBWriter {
                 copyToPackedNumberArray(numberArray, mesh.data.param.float64Data(), mesh.data.param.float64Length);
                 paramOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.Polyface.createPointVector(this.builder, numberArray);
             }
-            if (mesh.data.auxData) {
-                auxDataOffset = this.writePolyfaceAuxDataAsFBVariantGeometry(mesh.data.auxData);
-            }
+            if (mesh.data.auxData)
+                auxDataOffset = this.writePolyfaceAuxDataAsFBVariantGeometry(mesh, mesh.data.auxData);
             if (mesh.data.taggedNumericData)
                 taggedNumericDataOffset = this.writeTaggedNumericDataArray(mesh.data.taggedNumericData);
             const expectedClosure = mesh.expectedClosure;
+            // NOTE: mesh.data.face is not persistent
             const polyfaceOffset = _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.Polyface.createPolyface(this.builder, pointOffset, paramOffset, normalOffset, 0, intColorOffset, pointIndexOffset, paramIndexOffset, normalIndexOffset, colorIndexOffset, 0, 0, 0, meshStyle, twoSided, numPerFace, 0, auxDataOffset, expectedClosure, taggedNumericDataOffset);
             return _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.VariantGeometry.createVariantGeometry(this.builder, _BGFBAccessors__WEBPACK_IMPORTED_MODULE_3__.BGFBAccessors.VariantGeometryUnion.tagPolyface, polyfaceOffset, 0);
         }
@@ -253086,48 +253262,49 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "IModelJson": () => (/* binding */ IModelJson)
 /* harmony export */ });
-/* harmony import */ var _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../bspline/AkimaCurve3d */ "../../core/geometry/lib/esm/bspline/AkimaCurve3d.js");
-/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
-/* harmony import */ var _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../bspline/BSplineCurve3dH */ "../../core/geometry/lib/esm/bspline/BSplineCurve3dH.js");
-/* harmony import */ var _bspline_BSplineCurveOps__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ../bspline/BSplineCurveOps */ "../../core/geometry/lib/esm/bspline/BSplineCurveOps.js");
-/* harmony import */ var _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../bspline/BSplineSurface */ "../../core/geometry/lib/esm/bspline/BSplineSurface.js");
-/* harmony import */ var _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../bspline/InterpolationCurve3d */ "../../core/geometry/lib/esm/bspline/InterpolationCurve3d.js");
-/* harmony import */ var _bspline_KnotVector__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ../bspline/KnotVector */ "../../core/geometry/lib/esm/bspline/KnotVector.js");
-/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
-/* harmony import */ var _curve_CoordinateXYZ__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../curve/CoordinateXYZ */ "../../core/geometry/lib/esm/curve/CoordinateXYZ.js");
-/* harmony import */ var _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../curve/CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
-/* harmony import */ var _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../curve/GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
-/* harmony import */ var _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../curve/LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
-/* harmony import */ var _curve_LineString3d__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../curve/LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
-/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
-/* harmony import */ var _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../curve/ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
-/* harmony import */ var _curve_Path__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../curve/Path */ "../../core/geometry/lib/esm/curve/Path.js");
-/* harmony import */ var _curve_PointString3d__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../curve/PointString3d */ "../../core/geometry/lib/esm/curve/PointString3d.js");
-/* harmony import */ var _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../curve/spiral/DirectSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/DirectSpiral3d.js");
-/* harmony import */ var _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../curve/spiral/IntegratedSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/IntegratedSpiral3d.js");
-/* harmony import */ var _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../curve/UnionRegion */ "../../core/geometry/lib/esm/curve/UnionRegion.js");
-/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
-/* harmony import */ var _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.js");
-/* harmony import */ var _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../geometry3d/AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
-/* harmony import */ var _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ../geometry3d/GeometryHandler */ "../../core/geometry/lib/esm/geometry3d/GeometryHandler.js");
-/* harmony import */ var _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../geometry3d/Matrix3d */ "../../core/geometry/lib/esm/geometry3d/Matrix3d.js");
-/* harmony import */ var _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ../geometry3d/Point2dVector2d */ "../../core/geometry/lib/esm/geometry3d/Point2dVector2d.js");
-/* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
-/* harmony import */ var _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../geometry3d/Ray3d */ "../../core/geometry/lib/esm/geometry3d/Ray3d.js");
-/* harmony import */ var _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../geometry3d/Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
-/* harmony import */ var _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../geometry3d/Transform */ "../../core/geometry/lib/esm/geometry3d/Transform.js");
-/* harmony import */ var _geometry3d_YawPitchRollAngles__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../geometry3d/YawPitchRollAngles */ "../../core/geometry/lib/esm/geometry3d/YawPitchRollAngles.js");
-/* harmony import */ var _polyface_AuxData__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../polyface/AuxData */ "../../core/geometry/lib/esm/polyface/AuxData.js");
-/* harmony import */ var _polyface_Polyface__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../polyface/Polyface */ "../../core/geometry/lib/esm/polyface/Polyface.js");
-/* harmony import */ var _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../polyface/TaggedNumericData */ "../../core/geometry/lib/esm/polyface/TaggedNumericData.js");
-/* harmony import */ var _solid_Box__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../solid/Box */ "../../core/geometry/lib/esm/solid/Box.js");
-/* harmony import */ var _solid_Cone__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../solid/Cone */ "../../core/geometry/lib/esm/solid/Cone.js");
-/* harmony import */ var _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../solid/LinearSweep */ "../../core/geometry/lib/esm/solid/LinearSweep.js");
-/* harmony import */ var _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../solid/RotationalSweep */ "../../core/geometry/lib/esm/solid/RotationalSweep.js");
-/* harmony import */ var _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../solid/RuledSweep */ "../../core/geometry/lib/esm/solid/RuledSweep.js");
-/* harmony import */ var _solid_Sphere__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../solid/Sphere */ "../../core/geometry/lib/esm/solid/Sphere.js");
-/* harmony import */ var _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../solid/TorusPipe */ "../../core/geometry/lib/esm/solid/TorusPipe.js");
-/* harmony import */ var _SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./SerializationHelpers */ "../../core/geometry/lib/esm/serialization/SerializationHelpers.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 _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../bspline/AkimaCurve3d */ "../../core/geometry/lib/esm/bspline/AkimaCurve3d.js");
+/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
+/* harmony import */ var _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../bspline/BSplineCurve3dH */ "../../core/geometry/lib/esm/bspline/BSplineCurve3dH.js");
+/* harmony import */ var _bspline_BSplineCurveOps__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ../bspline/BSplineCurveOps */ "../../core/geometry/lib/esm/bspline/BSplineCurveOps.js");
+/* harmony import */ var _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../bspline/BSplineSurface */ "../../core/geometry/lib/esm/bspline/BSplineSurface.js");
+/* harmony import */ var _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../bspline/InterpolationCurve3d */ "../../core/geometry/lib/esm/bspline/InterpolationCurve3d.js");
+/* harmony import */ var _bspline_KnotVector__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ../bspline/KnotVector */ "../../core/geometry/lib/esm/bspline/KnotVector.js");
+/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
+/* harmony import */ var _curve_CoordinateXYZ__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../curve/CoordinateXYZ */ "../../core/geometry/lib/esm/curve/CoordinateXYZ.js");
+/* harmony import */ var _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../curve/CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
+/* harmony import */ var _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../curve/GeometryQuery */ "../../core/geometry/lib/esm/curve/GeometryQuery.js");
+/* harmony import */ var _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ../curve/LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
+/* harmony import */ var _curve_LineString3d__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ../curve/LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
+/* harmony import */ var _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ../curve/ParityRegion */ "../../core/geometry/lib/esm/curve/ParityRegion.js");
+/* harmony import */ var _curve_Path__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ../curve/Path */ "../../core/geometry/lib/esm/curve/Path.js");
+/* harmony import */ var _curve_PointString3d__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ../curve/PointString3d */ "../../core/geometry/lib/esm/curve/PointString3d.js");
+/* harmony import */ var _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../curve/spiral/DirectSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/DirectSpiral3d.js");
+/* harmony import */ var _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../curve/spiral/IntegratedSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/IntegratedSpiral3d.js");
+/* harmony import */ var _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ../curve/UnionRegion */ "../../core/geometry/lib/esm/curve/UnionRegion.js");
+/* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
+/* harmony import */ var _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.js");
+/* harmony import */ var _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../geometry3d/AngleSweep */ "../../core/geometry/lib/esm/geometry3d/AngleSweep.js");
+/* harmony import */ var _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ../geometry3d/GeometryHandler */ "../../core/geometry/lib/esm/geometry3d/GeometryHandler.js");
+/* harmony import */ var _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../geometry3d/Matrix3d */ "../../core/geometry/lib/esm/geometry3d/Matrix3d.js");
+/* harmony import */ var _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ../geometry3d/Point2dVector2d */ "../../core/geometry/lib/esm/geometry3d/Point2dVector2d.js");
+/* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
+/* harmony import */ var _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ../geometry3d/Ray3d */ "../../core/geometry/lib/esm/geometry3d/Ray3d.js");
+/* harmony import */ var _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../geometry3d/Segment1d */ "../../core/geometry/lib/esm/geometry3d/Segment1d.js");
+/* harmony import */ var _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../geometry3d/Transform */ "../../core/geometry/lib/esm/geometry3d/Transform.js");
+/* harmony import */ var _geometry3d_YawPitchRollAngles__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../geometry3d/YawPitchRollAngles */ "../../core/geometry/lib/esm/geometry3d/YawPitchRollAngles.js");
+/* harmony import */ var _polyface_AuxData__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../polyface/AuxData */ "../../core/geometry/lib/esm/polyface/AuxData.js");
+/* harmony import */ var _polyface_Polyface__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../polyface/Polyface */ "../../core/geometry/lib/esm/polyface/Polyface.js");
+/* harmony import */ var _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../polyface/TaggedNumericData */ "../../core/geometry/lib/esm/polyface/TaggedNumericData.js");
+/* harmony import */ var _solid_Box__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ../solid/Box */ "../../core/geometry/lib/esm/solid/Box.js");
+/* harmony import */ var _solid_Cone__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../solid/Cone */ "../../core/geometry/lib/esm/solid/Cone.js");
+/* harmony import */ var _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ../solid/LinearSweep */ "../../core/geometry/lib/esm/solid/LinearSweep.js");
+/* harmony import */ var _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ../solid/RotationalSweep */ "../../core/geometry/lib/esm/solid/RotationalSweep.js");
+/* harmony import */ var _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ../solid/RuledSweep */ "../../core/geometry/lib/esm/solid/RuledSweep.js");
+/* harmony import */ var _solid_Sphere__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ../solid/Sphere */ "../../core/geometry/lib/esm/solid/Sphere.js");
+/* harmony import */ var _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ../solid/TorusPipe */ "../../core/geometry/lib/esm/solid/TorusPipe.js");
+/* harmony import */ var _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./SerializationHelpers */ "../../core/geometry/lib/esm/serialization/SerializationHelpers.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -253175,6 +253352,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 // cspell:word bagof
@@ -253195,32 +253373,32 @@ var IModelJson;
         static parseVector3dProperty(json, propertyName, defaultValue) {
             if (json.hasOwnProperty(propertyName)) {
                 const value = json[propertyName];
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(value, 3))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.create(value[0], value[1], value[2]);
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(value, 2))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.create(value[0], value[1]);
-                if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.XYZ.isXAndY(value))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.fromJSON(value);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(value, 3))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.create(value[0], value[1], value[2]);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(value, 2))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.create(value[0], value[1]);
+                if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.XYZ.isXAndY(value))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.fromJSON(value);
             }
             return defaultValue;
         }
         static parsePoint3dProperty(json, propertyName, defaultValue) {
             if (json.hasOwnProperty(propertyName)) {
                 const value = json[propertyName];
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(value, 3))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(value[0], value[1], value[2]);
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(value, 2))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(value[0], value[1]);
-                if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.XYZ.isXAndY(value))
-                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(value);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(value, 3))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.create(value[0], value[1], value[2]);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(value, 2))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.create(value[0], value[1]);
+                if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.XYZ.isXAndY(value))
+                    return _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(value);
             }
             return defaultValue;
         }
         static parseSegment1dProperty(json, propertyName, defaultValue) {
             if (json.hasOwnProperty(propertyName)) {
                 const value = json[propertyName];
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(value, 2))
-                    return _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_2__.Segment1d.create(value[0], value[1]);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(value, 2))
+                    return _geometry3d_Segment1d__WEBPACK_IMPORTED_MODULE_3__.Segment1d.create(value[0], value[1]);
             }
             return defaultValue;
         }
@@ -253239,7 +253417,7 @@ var IModelJson;
             const tagA = this.parseNumberProperty(json, "tagA");
             const tagB = this.parseNumberProperty(json, "tagB", 0);
             if (tagA !== undefined) {
-                const result = new _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_3__.TaggedNumericData(tagA, tagB);
+                const result = new _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_4__.TaggedNumericData(tagA, tagB);
                 if (json.hasOwnProperty("intData"))
                     result.intData = this.parseNumberArrayProperty(json, "intData", 0, undefined);
                 if (json.hasOwnProperty("doubleData"))
@@ -253265,7 +253443,7 @@ var IModelJson;
         static parseAngleProperty(json, propertyName, defaultValue) {
             if (json.hasOwnProperty(propertyName)) {
                 const value = json[propertyName];
-                return _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_4__.Angle.fromJSON(value);
+                return _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_5__.Angle.fromJSON(value);
             }
             return defaultValue;
         }
@@ -253275,7 +253453,7 @@ var IModelJson;
         static parseAngleSweepProps(json, propertyName, defaultFunction) {
             if (json.hasOwnProperty(propertyName)) {
                 const value = json[propertyName];
-                return _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_5__.AngleSweep.fromJSON(value);
+                return _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_6__.AngleSweep.fromJSON(value);
             }
             if (defaultFunction === undefined)
                 return undefined;
@@ -253298,7 +253476,7 @@ var IModelJson;
                     const result = [];
                     for (const contourData of value) {
                         const contour = Reader.parse(contourData);
-                        if (contour instanceof _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_6__.CurveCollection) {
+                        if (contour instanceof _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_7__.CurveCollection) {
                             result.push(contour);
                         }
                     }
@@ -253309,7 +253487,7 @@ var IModelJson;
             return undefined;
         }
         static parseYawPitchRollAnglesToMatrix3d(json) {
-            const ypr = _geometry3d_YawPitchRollAngles__WEBPACK_IMPORTED_MODULE_7__.YawPitchRollAngles.fromJSON(json);
+            const ypr = _geometry3d_YawPitchRollAngles__WEBPACK_IMPORTED_MODULE_8__.YawPitchRollAngles.fromJSON(json);
             return ypr.toMatrix3d();
         }
         static parseStringProperty(json, propertyName, defaultValue) {
@@ -253322,14 +253500,14 @@ var IModelJson;
         }
         static parseAxesFromVectors(json, axisOrder, createDefaultIdentity) {
             if (Array.isArray(json) && json.length === 2) {
-                const xVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.fromJSON(json[0]);
-                const yVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.fromJSON(json[1]);
-                const matrix = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__.Matrix3d.createRigidFromColumns(xVector, yVector, axisOrder);
+                const xVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.fromJSON(json[0]);
+                const yVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.fromJSON(json[1]);
+                const matrix = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__.Matrix3d.createRigidFromColumns(xVector, yVector, axisOrder);
                 if (matrix)
                     return matrix;
             }
             if (createDefaultIdentity)
-                return _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__.Matrix3d.createIdentity();
+                return _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__.Matrix3d.createIdentity();
             return undefined;
         }
         /**
@@ -253346,13 +253524,13 @@ var IModelJson;
                 return Reader.parseYawPitchRollAnglesToMatrix3d(json.yawPitchRollAngles);
             }
             else if (json.xyVectors) {
-                return Reader.parseAxesFromVectors(json.xyVectors, _Geometry__WEBPACK_IMPORTED_MODULE_0__.AxisOrder.XYZ, createDefaultIdentity);
+                return Reader.parseAxesFromVectors(json.xyVectors, _Geometry__WEBPACK_IMPORTED_MODULE_1__.AxisOrder.XYZ, createDefaultIdentity);
             }
             else if (json.zxVectors) {
-                return Reader.parseAxesFromVectors(json.zxVectors, _Geometry__WEBPACK_IMPORTED_MODULE_0__.AxisOrder.ZXY, createDefaultIdentity);
+                return Reader.parseAxesFromVectors(json.zxVectors, _Geometry__WEBPACK_IMPORTED_MODULE_1__.AxisOrder.ZXY, createDefaultIdentity);
             }
             if (createDefaultIdentity)
-                return _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__.Matrix3d.createIdentity();
+                return _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__.Matrix3d.createIdentity();
             return undefined;
         }
         static parseArcByVectorProps(data) {
@@ -253361,17 +253539,17 @@ var IModelJson;
                 && data.vectorX !== undefined
                 && data.vectorY !== undefined
                 && data.sweepStartEnd !== undefined) {
-                return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_9__.Arc3d.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(data.center), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.fromJSON(data.vectorX), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.fromJSON(data.vectorY), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_5__.AngleSweep.fromJSON(data.sweepStartEnd));
+                return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_10__.Arc3d.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(data.center), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.fromJSON(data.vectorX), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.fromJSON(data.vectorY), _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_6__.AngleSweep.fromJSON(data.sweepStartEnd));
             }
             return undefined;
         }
         // remark: Returns LineString3d as last default when give points are colinear.
         static parseArcBy3Points(data) {
             if (Array.isArray(data) && data.length > 2) {
-                const pointA = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(data[0]);
-                const pointB = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(data[1]);
-                const pointC = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(data[2]);
-                return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_9__.Arc3d.createCircularStartMiddleEnd(pointA, pointB, pointC);
+                const pointA = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(data[0]);
+                const pointB = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(data[1]);
+                const pointC = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(data[2]);
+                return _curve_Arc3d__WEBPACK_IMPORTED_MODULE_10__.Arc3d.createCircularStartMiddleEnd(pointA, pointB, pointC);
             }
             return undefined;
         }
@@ -253384,9 +253562,9 @@ var IModelJson;
         }
         /** Parse point content (right side) `[1,2,3]` to a CoordinateXYZ object. */
         static parseCoordinate(data) {
-            const point = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(data);
+            const point = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(data);
             if (point)
-                return _curve_CoordinateXYZ__WEBPACK_IMPORTED_MODULE_10__.CoordinateXYZ.create(point);
+                return _curve_CoordinateXYZ__WEBPACK_IMPORTED_MODULE_11__.CoordinateXYZ.create(point);
             return undefined;
         }
         /** Parse TransitionSpiral content (right side) to TransitionSpiral3d. */
@@ -253410,10 +253588,10 @@ var IModelJson;
             // REMARK:  Our job is to parse and pass data along -- inscrutable validation happens in the implementation classes . . .
             if (origin) {
                 let candidate;
-                candidate = _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_11__.IntegratedSpiral3d.createFrom4OutOf5(spiralType, startRadius, endRadius, startBearing, endBearing, length, interval, _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_12__.Transform.createOriginAndMatrix(origin, axes));
+                candidate = _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__.IntegratedSpiral3d.createFrom4OutOf5(spiralType, startRadius, endRadius, startBearing, endBearing, length, interval, _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_13__.Transform.createOriginAndMatrix(origin, axes));
                 if (candidate)
                     return candidate;
-                candidate = _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_13__.DirectSpiral3d.createFromLengthAndRadius(spiralType, startRadius, endRadius, startBearing, endBearing, length, interval, _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_12__.Transform.createOriginAndMatrix(origin, axes));
+                candidate = _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_14__.DirectSpiral3d.createFromLengthAndRadius(spiralType, startRadius, endRadius, startBearing, endBearing, length, interval, _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_13__.Transform.createOriginAndMatrix(origin, axes));
                 if (candidate)
                     return candidate;
             }
@@ -253428,14 +253606,14 @@ var IModelJson;
                 && data.hasOwnProperty("order") && Number.isFinite(data.order)
                 && data.hasOwnProperty("points") && Array.isArray(data.points) && Array.isArray(data.points[0])
                 && (dim = data.points[0].length) >= 3 && dim <= 4) {
-                const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.createBSplineCurveData(data.points, dim, data.knots, data.points.length, data.order);
+                const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.createBSplineCurveData(data.points, dim, data.knots, data.points.length, data.order);
                 if (data.hasOwnProperty("closed") && true === data.closed)
                     myData.params.closed = true;
-                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.Import.prepareBSplineCurveData(myData)) {
+                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.Import.prepareBSplineCurveData(myData)) {
                     if (dim === 3)
-                        newCurve = _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_15__.BSplineCurve3d.create(myData.poles, myData.params.knots, myData.params.order);
+                        newCurve = _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_16__.BSplineCurve3d.create(myData.poles, myData.params.knots, myData.params.order);
                     else
-                        newCurve = _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_16__.BSplineCurve3dH.create(myData.poles, myData.params.knots, myData.params.order);
+                        newCurve = _bspline_BSplineCurve3dH__WEBPACK_IMPORTED_MODULE_17__.BSplineCurve3dH.create(myData.poles, myData.params.knots, myData.params.order);
                     if (undefined !== newCurve) {
                         if (undefined !== myData.params.wrapMode)
                             newCurve.setWrappable(myData.params.wrapMode);
@@ -253448,13 +253626,13 @@ var IModelJson;
         static parseInterpolationCurve(data) {
             if (data === undefined)
                 return undefined;
-            return _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_17__.InterpolationCurve3d.create(data);
+            return _bspline_InterpolationCurve3d__WEBPACK_IMPORTED_MODULE_18__.InterpolationCurve3d.create(data);
         }
         /** Parse `bcurve` content to an Akima curve object. */
         static parseAkimaCurve3d(data) {
             if (data === undefined)
                 return undefined;
-            return _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_18__.AkimaCurve3d.create(data);
+            return _bspline_AkimaCurve3d__WEBPACK_IMPORTED_MODULE_19__.AkimaCurve3d.create(data);
         }
         /** Parse array of json objects to array of instances. */
         static parseArray(data) {
@@ -253470,24 +253648,6 @@ var IModelJson;
             }
             return undefined;
         }
-        // For each nonzero index, Announce Math.abs (value) -1
-        static addZeroBasedIndicesFromSignedOneBased(data, numPerFace, f) {
-            if (data && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(data)) {
-                if (numPerFace > 1) {
-                    // all indices are used ...
-                    for (const value of data) {
-                        f(Math.abs(value) - 1);
-                    }
-                }
-                else {
-                    // ignore separator zeros ...
-                    for (const value of data) {
-                        if (value !== 0)
-                            f(Math.abs(value) - 1);
-                    }
-                }
-            }
-        }
         /** parse polyface aux data content to PolyfaceAuxData instance */
         static parsePolyfaceAuxData(data = undefined, numPerFace = 0) {
             if (!Array.isArray(data.channels) || !Array.isArray(data.indices))
@@ -253498,13 +253658,13 @@ var IModelJson;
                     const outChannelData = [];
                     for (const inChannelData of inChannel.data) {
                         if (inChannelData.hasOwnProperty("input") && Array.isArray(inChannelData.values))
-                            outChannelData.push(new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_19__.AuxChannelData(inChannelData.input, inChannelData.values));
+                            outChannelData.push(new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_20__.AuxChannelData(inChannelData.input, inChannelData.values));
                     }
-                    outChannels.push(new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_19__.AuxChannel(outChannelData, inChannel.dataType, inChannel.name, inChannel.inputName));
+                    outChannels.push(new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_20__.AuxChannel(outChannelData, inChannel.dataType, inChannel.name, inChannel.inputName));
                 }
             }
-            const auxData = new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_19__.PolyfaceAuxData(outChannels, []);
-            Reader.addZeroBasedIndicesFromSignedOneBased(data.indices, numPerFace, (x) => { auxData.indices.push(x); });
+            const auxData = new _polyface_AuxData__WEBPACK_IMPORTED_MODULE_20__.PolyfaceAuxData(outChannels, []);
+            _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(data.indices, numPerFace, (x) => { auxData.indices.push(x); });
             return auxData;
         }
         /** parse indexed mesh content to an IndexedPolyface instance */
@@ -253513,75 +253673,50 @@ var IModelJson;
             // CoordIndex[1,2,3,0]    -- zero-terminated, one based !!!
             if (data.hasOwnProperty("point") && Array.isArray(data.point)
                 && data.hasOwnProperty("pointIndex") && Array.isArray(data.pointIndex)) {
-                const polyface = _polyface_Polyface__WEBPACK_IMPORTED_MODULE_20__.IndexedPolyface.create();
-                if (data.hasOwnProperty("normal") && Array.isArray(data.normal)) {
-                    // for normals, addNormal() is overeager to detect the (common) case of duplicate normals in sequence.
-                    // use addNormalXYZ which always creates a new one.
-                    // likewise for params
-                    for (const uvw of data.normal) {
-                        if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(uvw, 3))
-                            polyface.addNormalXYZ(uvw[0], uvw[1], uvw[2]);
-                    }
-                }
+                const polyface = _polyface_Polyface__WEBPACK_IMPORTED_MODULE_21__.IndexedPolyface.create();
+                const numPerFace = data.hasOwnProperty("numPerFace") ? data.numPerFace : 0;
                 if (data.hasOwnProperty("twoSided")) {
                     const q = data.twoSided;
                     if (q === true || q === false) {
                         polyface.twoSided = q;
                     }
                 }
-                const numPerFace = data.hasOwnProperty("numPerFace") ? data.numPerFace : 0;
                 if (data.hasOwnProperty("expectedClosure")) {
                     const q = data.expectedClosure;
                     if (Number.isFinite(q)) {
                         polyface.expectedClosure = q;
                     }
                 }
-                if (data.hasOwnProperty("param") && Array.isArray(data.param)) {
+                if (data.hasOwnProperty("normal") && Array.isArray(data.normal) && data.hasOwnProperty("normalIndex")) {
+                    // For normals, addNormal() is overeager to detect the (common) case of duplicate normals in sequence.
+                    // Use addNormalXYZ which always creates a new one. Likewise for params.
+                    for (const uvw of data.normal) {
+                        if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(uvw, 3))
+                            polyface.addNormalXYZ(uvw[0], uvw[1], uvw[2]);
+                    }
+                    _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(data.normalIndex, numPerFace, (x) => { polyface.addNormalIndex(x); });
+                }
+                if (data.hasOwnProperty("param") && Array.isArray(data.param) && data.hasOwnProperty("paramIndex")) {
                     for (const uv of data.param) {
-                        if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(uv, 2))
+                        if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(uv, 2))
                             polyface.addParamUV(uv[0], uv[1]);
                     }
+                    _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(data.paramIndex, numPerFace, (x) => { polyface.addParamIndex(x); });
                 }
-                if (data.hasOwnProperty("color") && Array.isArray(data.color)) {
-                    for (const c of data.color) {
+                if (data.hasOwnProperty("color") && Array.isArray(data.color) && data.hasOwnProperty("colorIndex")) {
+                    for (const c of data.color)
                         polyface.addColor(c);
-                    }
+                    _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(data.colorIndex, numPerFace, (x) => { polyface.addColorIndex(x); });
                 }
                 for (const p of data.point)
                     polyface.addPointXYZ(p[0], p[1], p[2]);
-                if (numPerFace > 1) {
-                    for (let i = 0; i < data.pointIndex.length; i++) {
-                        const p = data.pointIndex[i];
-                        const p0 = Math.abs(p) - 1;
-                        polyface.addPointIndex(p0, p > 0);
-                        if ((i + 1) % numPerFace === 0)
-                            polyface.terminateFacet(false);
-                    }
-                }
-                else {
-                    for (const p of data.pointIndex) {
-                        if (p === 0)
-                            polyface.terminateFacet(false); // we are responsible for index checking !!!
-                        else {
-                            const p0 = Math.abs(p) - 1;
-                            polyface.addPointIndex(p0, p > 0);
-                        }
-                    }
-                }
-                if (data.hasOwnProperty("normalIndex")) {
-                    Reader.addZeroBasedIndicesFromSignedOneBased(data.normalIndex, numPerFace, (x) => { polyface.addNormalIndex(x); });
-                }
-                if (data.hasOwnProperty("paramIndex")) {
-                    Reader.addZeroBasedIndicesFromSignedOneBased(data.paramIndex, numPerFace, (x) => { polyface.addParamIndex(x); });
-                }
-                if (data.hasOwnProperty("colorIndex")) {
-                    Reader.addZeroBasedIndicesFromSignedOneBased(data.colorIndex, numPerFace, (x) => { polyface.addColorIndex(x); });
-                }
+                _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices(data.pointIndex, numPerFace, (i, v) => { polyface.addPointIndex(i, v); }, () => { polyface.terminateFacet(false); });
+                if (!polyface.validateAllIndices())
+                    return undefined;
                 if (data.hasOwnProperty("auxData"))
                     polyface.data.auxData = Reader.parsePolyfaceAuxData(data.auxData, numPerFace);
-                if (data.hasOwnProperty("tags")) {
+                if (data.hasOwnProperty("tags"))
                     polyface.data.taggedNumericData = Reader.parseTaggedNumericProps(data.tags);
-                }
                 return polyface;
             }
             return undefined;
@@ -253591,7 +253726,7 @@ var IModelJson;
             if (data && Array.isArray(data)) {
                 for (const c of data) {
                     const g = Reader.parse(c);
-                    if (g instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_21__.GeometryQuery && ("curveCollection" === g.geometryCategory || "curvePrimitive" === g.geometryCategory))
+                    if (g instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_22__.GeometryQuery && ("curveCollection" === g.geometryCategory || "curvePrimitive" === g.geometryCategory))
                         result.tryAddChild(g);
                 }
                 return result;
@@ -253609,21 +253744,21 @@ var IModelJson;
                 && data.hasOwnProperty("orderV") && Number.isFinite(data.orderV)
                 && data.hasOwnProperty("points") && Array.isArray(data.points) && Array.isArray(data.points[0]) && Array.isArray(data.points[0][0])
                 && (dim = data.points[0][0].length) >= 3 && dim <= 4) {
-                const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.createBSplineSurfaceData(data.points, dim, data.uKnots, data.points[0].length, data.orderU, data.vKnots, data.points.length, data.orderV);
+                const myData = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.createBSplineSurfaceData(data.points, dim, data.uKnots, data.points[0].length, data.orderU, data.vKnots, data.points.length, data.orderV);
                 if (data.hasOwnProperty("closedU") && true === data.closedU)
                     myData.uParams.closed = true;
                 if (data.hasOwnProperty("closedV") && true === data.closedV)
                     myData.vParams.closed = true;
-                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.Import.prepareBSplineSurfaceData(myData, { jsonPoles: true })) {
+                if (_SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.Import.prepareBSplineSurfaceData(myData, { jsonPoles: true })) {
                     if (dim === 3)
-                        newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.BSplineSurface3d.createGrid(myData.poles, myData.uParams.order, myData.uParams.knots, myData.vParams.order, myData.vParams.knots);
+                        newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.BSplineSurface3d.createGrid(myData.poles, myData.uParams.order, myData.uParams.knots, myData.vParams.order, myData.vParams.knots);
                     else
-                        newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.BSplineSurface3dH.createGrid(myData.poles, _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.WeightStyle.WeightsAlreadyAppliedToCoordinates, myData.uParams.order, myData.uParams.knots, myData.vParams.order, myData.vParams.knots);
+                        newSurface = _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.BSplineSurface3dH.createGrid(myData.poles, _bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.WeightStyle.WeightsAlreadyAppliedToCoordinates, myData.uParams.order, myData.uParams.knots, myData.vParams.order, myData.vParams.knots);
                     if (undefined !== newSurface) {
                         if (undefined !== myData.uParams.wrapMode)
-                            newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.uDirection, myData.uParams.wrapMode);
+                            newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.uDirection, myData.uParams.wrapMode);
                         if (undefined !== myData.vParams.wrapMode)
-                            newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.vDirection, myData.vParams.wrapMode);
+                            newSurface.setWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.vDirection, myData.vParams.wrapMode);
                     }
                 }
             }
@@ -253643,14 +253778,14 @@ var IModelJson;
                 && startRadius !== undefined
                 && endRadius !== undefined) {
                 if (axes === undefined) {
-                    const axisVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.createStartEnd(start, end);
-                    const frame = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__.Matrix3d.createRigidHeadsUp(axisVector, _Geometry__WEBPACK_IMPORTED_MODULE_0__.AxisOrder.ZXY);
+                    const axisVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.createStartEnd(start, end);
+                    const frame = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__.Matrix3d.createRigidHeadsUp(axisVector, _Geometry__WEBPACK_IMPORTED_MODULE_1__.AxisOrder.ZXY);
                     const vectorX = frame.columnX();
                     const vectorY = frame.columnY();
-                    return _solid_Cone__WEBPACK_IMPORTED_MODULE_23__.Cone.createBaseAndTarget(start, end, vectorX, vectorY, startRadius, endRadius, capped);
+                    return _solid_Cone__WEBPACK_IMPORTED_MODULE_24__.Cone.createBaseAndTarget(start, end, vectorX, vectorY, startRadius, endRadius, capped);
                 }
                 else {
-                    return _solid_Cone__WEBPACK_IMPORTED_MODULE_23__.Cone.createBaseAndTarget(start, end, axes.columnX(), axes.columnY(), startRadius, endRadius, capped);
+                    return _solid_Cone__WEBPACK_IMPORTED_MODULE_24__.Cone.createBaseAndTarget(start, end, axes.columnX(), axes.columnY(), startRadius, endRadius, capped);
                 }
             }
             return undefined;
@@ -253664,14 +253799,14 @@ var IModelJson;
             if (start
                 && end
                 && radius !== undefined) {
-                return _solid_Cone__WEBPACK_IMPORTED_MODULE_23__.Cone.createAxisPoints(start, end, radius, radius, capped);
+                return _solid_Cone__WEBPACK_IMPORTED_MODULE_24__.Cone.createAxisPoints(start, end, radius, radius, capped);
             }
             return undefined;
         }
         /** Parse line segment (array of 2 points) properties to `LineSegment3d` instance */
         static parseLineSegmentProps(value) {
             if (Array.isArray(value) && value.length > 1)
-                return _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_24__.LineSegment3d.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(value[0]), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(value[1]));
+                return _curve_LineSegment3d__WEBPACK_IMPORTED_MODULE_25__.LineSegment3d.create(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(value[0]), _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(value[1]));
             else
                 return undefined;
         }
@@ -253680,11 +253815,11 @@ var IModelJson;
             const contour = Reader.parse(json.contour);
             const capped = Reader.parseBooleanProperty(json, "capped");
             const extrusionVector = Reader.parseVector3dProperty(json, "vector");
-            if (contour instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_21__.GeometryQuery
+            if (contour instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_22__.GeometryQuery
                 && "curveCollection" === contour.geometryCategory
                 && capped !== undefined
                 && extrusionVector) {
-                return _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_25__.LinearSweep.create(contour, extrusionVector, capped);
+                return _solid_LinearSweep__WEBPACK_IMPORTED_MODULE_26__.LinearSweep.create(contour, extrusionVector, capped);
             }
             return undefined;
         }
@@ -253697,13 +253832,13 @@ var IModelJson;
             const axisVector = Reader.parseVector3dProperty(json, "axis");
             const center = Reader.parsePoint3dProperty(json, "center");
             const sweepDegrees = Reader.parseNumberProperty(json, "sweepAngle");
-            if (contour instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_21__.GeometryQuery
+            if (contour instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_22__.GeometryQuery
                 && "curveCollection" === contour.geometryCategory
                 && sweepDegrees !== undefined
                 && capped !== undefined
                 && axisVector
                 && center) {
-                return _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_26__.RotationalSweep.create(contour, _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_27__.Ray3d.createCapture(center, axisVector), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_4__.Angle.createDegrees(sweepDegrees), capped);
+                return _solid_RotationalSweep__WEBPACK_IMPORTED_MODULE_27__.RotationalSweep.create(contour, _geometry3d_Ray3d__WEBPACK_IMPORTED_MODULE_28__.Ray3d.createCapture(center, axisVector), _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_5__.Angle.createDegrees(sweepDegrees), capped);
             }
             return undefined;
         }
@@ -253721,7 +253856,7 @@ var IModelJson;
             const height = Reader.parseNumberProperty(json, "height", baseX);
             const axes = Reader.parseOrientation(json, true);
             if (origin && !topOrigin && height)
-                topOrigin = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_8__.Matrix3d.xyzPlusMatrixTimesXYZ(origin, axes, _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.create(0, 0, height));
+                topOrigin = _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_9__.Matrix3d.xyzPlusMatrixTimesXYZ(origin, axes, _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.create(0, 0, height));
             if (capped !== undefined
                 && baseX !== undefined
                 && baseY !== undefined
@@ -253730,7 +253865,7 @@ var IModelJson;
                 && axes
                 && origin
                 && topOrigin) {
-                return _solid_Box__WEBPACK_IMPORTED_MODULE_28__.Box.createDgnBoxWithAxes(origin, axes, topOrigin, baseX, baseY, topX, topY, capped);
+                return _solid_Box__WEBPACK_IMPORTED_MODULE_29__.Box.createDgnBoxWithAxes(origin, axes, topOrigin, baseX, baseY, topX, topY, capped);
             }
             return undefined;
         }
@@ -253752,7 +253887,7 @@ var IModelJson;
                 && radiusY !== undefined
                 && radiusZ !== undefined
                 && capped !== undefined) {
-                return _solid_Sphere__WEBPACK_IMPORTED_MODULE_29__.Sphere.createFromAxesAndScales(center, axes, radiusX, radiusY, radiusZ, latitudeStartEnd, capped);
+                return _solid_Sphere__WEBPACK_IMPORTED_MODULE_30__.Sphere.createFromAxesAndScales(center, axes, radiusX, radiusY, radiusZ, latitudeStartEnd, capped);
             }
             return undefined;
         }
@@ -253762,7 +253897,7 @@ var IModelJson;
             const contours = this.loadContourArray(json, "contour");
             if (contours !== undefined
                 && capped !== undefined) {
-                return _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_30__.RuledSweep.create(contours, capped);
+                return _solid_RuledSweep__WEBPACK_IMPORTED_MODULE_31__.RuledSweep.create(contours, capped);
             }
             return undefined;
         }
@@ -253777,7 +253912,7 @@ var IModelJson;
             if (center
                 && radiusA !== undefined
                 && radiusB !== undefined) {
-                return _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_31__.TorusPipe.createDgnTorusPipe(center, axes.columnX(), axes.columnY(), radiusA, radiusB, sweepAngle ? sweepAngle : _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_4__.Angle.createDegrees(360), capped);
+                return _solid_TorusPipe__WEBPACK_IMPORTED_MODULE_32__.TorusPipe.createDgnTorusPipe(center, axes.columnX(), axes.columnY(), radiusA, radiusB, sweepAngle ? sweepAngle : _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_5__.Angle.createDegrees(360), capped);
             }
             return undefined;
         }
@@ -253786,11 +253921,11 @@ var IModelJson;
             const points = [];
             if (json && Array.isArray(json)) {
                 for (const member of json) {
-                    if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.XYZ.isXAndY(member)) {
-                        points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(member));
+                    if (_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.XYZ.isXAndY(member)) {
+                        points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(member));
                     }
-                    else if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isNumberArray(member, 2)) {
-                        points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(member));
+                    else if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isNumberArray(member, 2)) {
+                        points.push(_geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.fromJSON(member));
                     }
                 }
             }
@@ -253803,7 +253938,7 @@ var IModelJson;
                     return Reader.parseLineSegmentProps(json.lineSegment);
                 }
                 else if (json.lineString !== undefined) {
-                    return _curve_LineString3d__WEBPACK_IMPORTED_MODULE_32__.LineString3d.create(Reader.parsePointArray(json.lineString));
+                    return _curve_LineString3d__WEBPACK_IMPORTED_MODULE_33__.LineString3d.create(Reader.parsePointArray(json.lineString));
                 }
                 else if (json.arc !== undefined) {
                     return Reader.parseArcObject(json.arc);
@@ -253821,19 +253956,19 @@ var IModelJson;
                     return Reader.parseAkimaCurve3d(json.akimaCurve);
                 }
                 else if (json.hasOwnProperty("path")) {
-                    return Reader.parseCurveCollectionMembers(new _curve_Path__WEBPACK_IMPORTED_MODULE_33__.Path(), json.path);
+                    return Reader.parseCurveCollectionMembers(new _curve_Path__WEBPACK_IMPORTED_MODULE_34__.Path(), json.path);
                 }
                 else if (json.hasOwnProperty("loop")) {
-                    return Reader.parseCurveCollectionMembers(new _curve_Loop__WEBPACK_IMPORTED_MODULE_34__.Loop(), json.loop);
+                    return Reader.parseCurveCollectionMembers(new _curve_Loop__WEBPACK_IMPORTED_MODULE_35__.Loop(), json.loop);
                 }
                 else if (json.hasOwnProperty("parityRegion")) {
-                    return Reader.parseCurveCollectionMembers(new _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_35__.ParityRegion(), json.parityRegion);
+                    return Reader.parseCurveCollectionMembers(new _curve_ParityRegion__WEBPACK_IMPORTED_MODULE_36__.ParityRegion(), json.parityRegion);
                 }
                 else if (json.hasOwnProperty("unionRegion")) {
-                    return Reader.parseCurveCollectionMembers(new _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_36__.UnionRegion(), json.unionRegion);
+                    return Reader.parseCurveCollectionMembers(new _curve_UnionRegion__WEBPACK_IMPORTED_MODULE_37__.UnionRegion(), json.unionRegion);
                 }
                 else if (json.hasOwnProperty("bagOfCurves")) {
-                    return Reader.parseCurveCollectionMembers(new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_6__.BagOfCurves(), json.bagOfCurves);
+                    return Reader.parseCurveCollectionMembers(new _curve_CurveCollection__WEBPACK_IMPORTED_MODULE_7__.BagOfCurves(), json.bagOfCurves);
                 }
                 else if (json.hasOwnProperty("indexedMesh")) {
                     return Reader.parseIndexedMesh(json.indexedMesh);
@@ -253866,7 +254001,7 @@ var IModelJson;
                     return Reader.parseTorusPipe(json.torusPipe);
                 }
                 else if (json.hasOwnProperty("pointString")) {
-                    return _curve_PointString3d__WEBPACK_IMPORTED_MODULE_37__.PointString3d.create(Reader.parsePointArray(json.pointString));
+                    return _curve_PointString3d__WEBPACK_IMPORTED_MODULE_38__.PointString3d.create(Reader.parsePointArray(json.pointString));
                 }
                 else if (json.hasOwnProperty("transitionSpiral")) {
                     return Reader.parseTransitionSpiral(json.transitionSpiral);
@@ -253887,7 +254022,7 @@ var IModelJson;
      * Class to deserialize json objects into GeometryQuery objects
      * @public
      */
-    class Writer extends _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_38__.GeometryHandler {
+    class Writer extends _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_39__.GeometryHandler {
         handleTaggedNumericData(data) {
             const result = { tagA: data.tagA, tagB: data.tagB };
             if (data.intData !== undefined && data.intData.length > 0)
@@ -253967,7 +254102,7 @@ var IModelJson;
             // TODO: HANDLE NONRIGID TRANSFORM !!
             // the spiral may have indication of how it was defined.  If so, use defined/undefined state of the original data
             // as indication of what current data to use.  (Current data may have changed due to transforms.)
-            if (data instanceof _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_13__.DirectSpiral3d) {
+            if (data instanceof _curve_spiral_DirectSpiral3d__WEBPACK_IMPORTED_MODULE_14__.DirectSpiral3d) {
                 const value = {
                     origin: data.localToWorld.origin.toJSON(),
                     type: data.spiralType,
@@ -253981,7 +254116,7 @@ var IModelJson;
                 value.length = data.nominalL1;
                 return { transitionSpiral: value };
             }
-            else if (data instanceof _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_11__.IntegratedSpiral3d) {
+            else if (data instanceof _curve_spiral_IntegratedSpiral3d__WEBPACK_IMPORTED_MODULE_12__.IntegratedSpiral3d) {
                 // TODO: HANDLE NONRIGID TRANSFORM !!
                 // the spiral may have indication of how it was defined.  If so, use defined/undefined state of the original data
                 // as indication of what current data to use.  (Current data may have changed due to transforms.)
@@ -254031,12 +254166,12 @@ var IModelJson;
             const centerB = data.getCenterB();
             const vectorX = data.getVectorX();
             const vectorY = data.getVectorY();
-            const axisVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.createStartEnd(centerA, centerB);
-            if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(radiusA, radiusB)
+            const axisVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.createStartEnd(centerA, centerB);
+            if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(radiusA, radiusB)
                 && vectorX.isPerpendicularTo(axisVector)
                 && vectorY.isPerpendicularTo(axisVector)
-                && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(vectorX.magnitude(), 1.0)
-                && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(vectorY.magnitude(), 1.0)) {
+                && _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(vectorX.magnitude(), 1.0)
+                && _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(vectorY.magnitude(), 1.0)) {
                 return {
                     cylinder: {
                         capped: data.capped,
@@ -254076,7 +254211,7 @@ var IModelJson;
                 const fullSweep = latitudeSweep.isFullLatitudeSweep;
                 if (data.capped && !fullSweep)
                     value.capped = data.capped;
-                if (_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(rX, rY) && _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(rX, rZ))
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(rX, rY) && _Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(rX, rZ))
                     value.radius = rX;
                 else {
                     value.radiusX = rX;
@@ -254230,35 +254365,25 @@ var IModelJson;
             };
             const outBox = out.box;
             Writer.insertXYOrientation(outBox, box.getVectorX(), box.getVectorY(), true);
-            if (!_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(box.getTopX(), box.getBaseX()))
+            if (!_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(box.getTopX(), box.getBaseX()))
                 outBox.topX = box.getTopX();
-            if (!_Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.isSameCoordinate(box.getTopY(), box.getBaseY()))
+            if (!_Geometry__WEBPACK_IMPORTED_MODULE_1__.Geometry.isSameCoordinate(box.getTopY(), box.getBaseY()))
                 outBox.topY = box.getTopY();
             return out;
         }
         handlePolyfaceAuxData(auxData, pf) {
-            const contents = {};
-            contents.indices = [];
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(auxData === pf.data.auxData);
+            const contents = { indices: [], channels: [] };
             const visitor = pf.createVisitor(0);
-            if (!visitor.auxData)
-                return;
             while (visitor.moveToNextFacet()) {
-                for (let i = 0; i < visitor.indexCount; i++) {
+                for (let i = 0; i < visitor.indexCount; i++)
                     contents.indices.push(visitor.auxData.indices[i] + 1);
-                }
                 contents.indices.push(0); // facet terminator.
             }
-            contents.channels = [];
             for (const inChannel of auxData.channels) {
-                const outChannel = {};
-                outChannel.dataType = inChannel.dataType;
-                outChannel.name = inChannel.name;
-                outChannel.inputName = inChannel.inputName;
-                outChannel.data = [];
+                const outChannel = { data: [], dataType: inChannel.dataType, name: inChannel.name, inputName: inChannel.inputName };
                 for (const inData of inChannel.data) {
-                    const outData = {};
-                    outData.input = inData.input;
-                    outData.values = inData.values.slice(0);
+                    const outData = { input: inData.input, values: inData.values.slice(0) };
                     outChannel.data.push(outData);
                 }
                 contents.channels.push(outChannel);
@@ -254273,20 +254398,20 @@ var IModelJson;
             const params = [];
             const colors = [];
             {
-                const p = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d.create();
+                const p = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Point3d.create();
                 for (let i = 0; pf.data.point.getPoint3dAtCheckedPointIndex(i, p); i++)
                     points.push(p.toJSON());
             }
             if (pf.data.normal) {
                 const numNormal = pf.data.normal.length;
-                const normal = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Vector3d.create();
+                const normal = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.create();
                 for (let i = 0; i < numNormal; i++) {
                     pf.data.normal.getVector3dAtCheckedVectorIndex(i, normal);
                     normals.push(normal.toJSON());
                 }
             }
             if (pf.data.param) {
-                const uv = _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_39__.Point2d.create();
+                const uv = _geometry3d_Point2dVector2d__WEBPACK_IMPORTED_MODULE_40__.Point2d.create();
                 for (let i = 0; pf.data.param.getPoint2dAtCheckedPointIndex(i, uv); i++)
                     params.push(uv.toJSON());
             }
@@ -254357,11 +254482,11 @@ var IModelJson;
             return { indexedMesh: contents };
         }
         handleBSplineCurve(curve) {
-            const data = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.createBSplineCurveData(curve.polesRef, curve.poleDimension, curve.knotsRef, curve.numPoles, curve.order);
+            const data = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.createBSplineCurveData(curve.polesRef, curve.poleDimension, curve.knotsRef, curve.numPoles, curve.order);
             const wrapMode = curve.getWrappable();
-            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_40__.BSplineWrapMode.None !== wrapMode)
+            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_41__.BSplineWrapMode.None !== wrapMode)
                 data.params.wrapMode = wrapMode;
-            if (!_SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.Export.prepareBSplineCurveData(data, { jsonPoles: true, jsonKnots: true }))
+            if (!_SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.Export.prepareBSplineCurveData(data, { jsonPoles: true, jsonKnots: true }))
                 return undefined;
             return {
                 bcurve: {
@@ -254379,7 +254504,7 @@ var IModelJson;
         /** Convert strongly typed instance to tagged json */
         handleInterpolationCurve3d(curve) {
             const props = curve.cloneProps();
-            _bspline_BSplineCurveOps__WEBPACK_IMPORTED_MODULE_41__.BSplineCurveOps.C2CubicFit.convertToJsonKnots(props);
+            _bspline_BSplineCurveOps__WEBPACK_IMPORTED_MODULE_42__.BSplineCurveOps.C2CubicFit.convertToJsonKnots(props);
             return { interpolationCurve: props };
         }
         /** Convert strongly typed instance to tagged json */
@@ -254428,14 +254553,14 @@ var IModelJson;
         }
         /** Convert strongly typed instance to tagged json */
         handleBSplineSurface(surface) {
-            const data = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.createBSplineSurfaceData(surface.coffs, surface.poleDimension, surface.knots[_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.uDirection].knots, surface.numPolesUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.uDirection), surface.orderUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.uDirection), surface.knots[_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.vDirection].knots, surface.numPolesUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.vDirection), surface.orderUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.vDirection));
-            const wrapModeU = surface.getWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.uDirection);
-            const wrapModeV = surface.getWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_22__.UVSelect.vDirection);
-            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_40__.BSplineWrapMode.None !== wrapModeU)
+            const data = _SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.createBSplineSurfaceData(surface.coffs, surface.poleDimension, surface.knots[_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.uDirection].knots, surface.numPolesUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.uDirection), surface.orderUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.uDirection), surface.knots[_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.vDirection].knots, surface.numPolesUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.vDirection), surface.orderUV(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.vDirection));
+            const wrapModeU = surface.getWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.uDirection);
+            const wrapModeV = surface.getWrappable(_bspline_BSplineSurface__WEBPACK_IMPORTED_MODULE_23__.UVSelect.vDirection);
+            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_41__.BSplineWrapMode.None !== wrapModeU)
                 data.uParams.wrapMode = wrapModeU;
-            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_40__.BSplineWrapMode.None !== wrapModeV)
+            if (_bspline_KnotVector__WEBPACK_IMPORTED_MODULE_41__.BSplineWrapMode.None !== wrapModeV)
                 data.vParams.wrapMode = wrapModeV;
-            if (!_SerializationHelpers__WEBPACK_IMPORTED_MODULE_14__.SerializationHelpers.Export.prepareBSplineSurfaceData(data, { jsonPoles: true, jsonKnots: true }))
+            if (!_SerializationHelpers__WEBPACK_IMPORTED_MODULE_15__.SerializationHelpers.Export.prepareBSplineSurfaceData(data, { jsonPoles: true, jsonKnots: true }))
                 return undefined;
             return {
                 bsurf: {
@@ -254466,10 +254591,10 @@ var IModelJson;
         emit(data) {
             if (Array.isArray(data))
                 return this.emitArray(data);
-            if (data instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_21__.GeometryQuery) {
+            if (data instanceof _curve_GeometryQuery__WEBPACK_IMPORTED_MODULE_22__.GeometryQuery) {
                 return data.dispatchToGeometryHandler(this);
             }
-            else if (data instanceof _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_3__.TaggedNumericData) {
+            else if (data instanceof _polyface_TaggedNumericData__WEBPACK_IMPORTED_MODULE_4__.TaggedNumericData) {
                 return this.handleTaggedNumericData(data);
             }
             return undefined;
@@ -254722,6 +254847,91 @@ var SerializationHelpers;
                 data.vParams.knots = _geometry3d_PointHelpers__WEBPACK_IMPORTED_MODULE_0__.NumberArray.pack(data.vParams.knots);
         }
     }
+    /**
+     * Process 1-based blocked indices into 0-based indices.
+     * @param sourceIndices signed, 1-based, 0-terminated/padded source indices, blocking specified by `numPerBlock`
+     * @param numPerBlock index blocking: fixed blocks of size numPerBlock > 1, possibly 0-padded; otherwise, variable-sized blocks terminated by 0
+     * @param announceZeroBasedIndex callback to receive a 0-based index and optional flag indicating whether the sign of the source index is positive
+     * @param terminateBlock optional callback called after each index block has been announced
+    */
+    function announceZeroBasedIndicesFromSignedOneBasedIndices(sourceIndices, numPerBlock, announceZeroBasedIndex, terminateBlock) {
+        let numIndices = sourceIndices.length;
+        if (!numIndices)
+            return;
+        if (numPerBlock > 1) {
+            numIndices -= sourceIndices.length % numPerBlock;
+            for (let i = 0; i < numIndices; i++) {
+                const p = sourceIndices[i];
+                if (p !== 0) // skip padding
+                    announceZeroBasedIndex(Math.abs(p) - 1, p > 0);
+                if (terminateBlock && ((i + 1) % numPerBlock) === 0)
+                    terminateBlock();
+            }
+        }
+        else {
+            for (let i = 0; i < numIndices; i++) {
+                const p = sourceIndices[i];
+                if (p !== 0) // skip terminator
+                    announceZeroBasedIndex(Math.abs(p) - 1, p > 0);
+                if (terminateBlock) {
+                    if (p === 0) {
+                        if (i + 1 === numIndices || sourceIndices[i + 1] !== 0) // skip extra terminators
+                            terminateBlock();
+                    }
+                    else {
+                        if (i + 1 === numIndices) // missing last terminator
+                            terminateBlock();
+                    }
+                }
+            }
+        }
+    }
+    SerializationHelpers.announceZeroBasedIndicesFromSignedOneBasedIndices = announceZeroBasedIndicesFromSignedOneBasedIndices;
+    /**
+     * Process 0-based indices with blocking specified by another index array.
+     * @param sourceIndices 0-based source indices. This array is compressed (has no blocking).
+     * @param blockingIndices 1-based source indices, blocking specified by `numPerBlock`. Assumed to have length equal to its zero count plus `sourceIndices.length`.
+     * @param numPerBlock index blocking: fixed blocks of size numPerBlock > 1, possibly 0-padded; otherwise, variable-sized blocks terminated by 0
+     * @param announceZeroBasedIndex callback to receive a 0-based index
+     * @param terminateBlock optional callback called after each index block has been announced
+    */
+    function announceZeroBasedIndicesWithExternalBlocking(sourceIndices, blockingIndices, numPerBlock, announceZeroBasedIndex, terminateBlock) {
+        if (!sourceIndices.length || !blockingIndices.length)
+            return;
+        const blockingZeroCount = blockingIndices.filter((i) => i === 0).length;
+        if (sourceIndices.length + blockingZeroCount !== blockingIndices.length)
+            return; // invalid input
+        let iSource = 0;
+        let numBlocking = blockingIndices.length;
+        if (numPerBlock > 1) {
+            numBlocking -= blockingIndices.length % numPerBlock;
+            for (let iBlocking = 0; iBlocking < numBlocking && iSource < sourceIndices.length; iBlocking++) {
+                const p = blockingIndices[iBlocking];
+                if (p !== 0) // skip padding
+                    announceZeroBasedIndex(sourceIndices[iSource++]);
+                if (terminateBlock && ((iBlocking + 1) % numPerBlock) === 0)
+                    terminateBlock();
+            }
+        }
+        else {
+            for (let iBlocking = 0; iBlocking < numBlocking && iSource < sourceIndices.length; iBlocking++) {
+                const p = blockingIndices[iBlocking];
+                if (p !== 0) // skip terminator
+                    announceZeroBasedIndex(sourceIndices[iSource++]);
+                if (terminateBlock) {
+                    if (p === 0) {
+                        if (iBlocking + 1 === numBlocking || blockingIndices[iBlocking + 1] !== 0) // skip extra terminators
+                            terminateBlock();
+                    }
+                    else {
+                        if (iBlocking + 1 === numBlocking) // missing last terminator
+                            terminateBlock();
+                    }
+                }
+            }
+        }
+    }
+    SerializationHelpers.announceZeroBasedIndicesWithExternalBlocking = announceZeroBasedIndicesWithExternalBlocking;
     /** Helper class for preparing geometry data for import. */
     class Import {
         /** copy knots, with options to control destination type and extraneous knot removal */
@@ -256276,12 +256486,14 @@ class Sphere extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimitive
     uFractionToRadians(u) {
         return u * Math.PI * 2.0;
     }
+    /** Constructor CAPTURES inputs */
     constructor(localToWorld, latitudeSweep, capped) {
         super(capped);
         /** String name for schema properties */
         this.solidPrimitiveType = "sphere";
         this._localToWorld = localToWorld;
         this._latitudeSweep = latitudeSweep ? latitudeSweep : _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_1__.AngleSweep.createFullLatitude();
+        this._latitudeSweep.capLatitudeInPlace();
     }
     /** return a deep clone */
     clone() {
@@ -256320,11 +256532,11 @@ class Sphere extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimitive
     /** Create from center and radius, with optional restricted latitudes. */
     static createCenterRadius(center, radius, latitudeSweep) {
         const localToWorld = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_2__.Transform.createOriginAndMatrix(center, _geometry3d_Matrix3d__WEBPACK_IMPORTED_MODULE_3__.Matrix3d.createUniformScale(radius));
-        return new Sphere(localToWorld, latitudeSweep ? latitudeSweep : _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_1__.AngleSweep.createFullLatitude(), false);
+        return new Sphere(localToWorld, latitudeSweep ? latitudeSweep.clone() : _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_1__.AngleSweep.createFullLatitude(), false);
     }
     /** Create an ellipsoid which is a unit sphere mapped to position by an (arbitrary, possibly skewed and scaled) transform. */
     static createEllipsoid(localToWorld, latitudeSweep, capped) {
-        return new Sphere(localToWorld, latitudeSweep, capped);
+        return new Sphere(localToWorld.clone(), latitudeSweep.clone(), capped);
     }
     /** Create a sphere from the typical parameters of the Dgn file */
     static createDgnSphere(center, vectorX, vectorZ, radiusXY, radiusZ, latitudeSweep, capped) {
@@ -297167,7 +297379,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.7.0-dev.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 && npm run -s webpackWorkers && npm run -s copy:workers","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","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/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-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -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 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/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.7.0-dev.0","@itwin/core-bentley":"workspace:^4.7.0-dev.0","@itwin/core-common":"workspace:^4.7.0-dev.0","@itwin/core-geometry":"workspace:^4.7.0-dev.0","@itwin/core-orbitgt":"workspace:^4.7.0-dev.0","@itwin/core-quantity":"workspace:^4.7.0-dev.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.52","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^10.0.6","@types/sinon":"^17.0.2","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.3.10","chai-as-promised":"^7.1.1","cpx2":"^3.0.0","eslint":"^8.44.0","glob":"^10.3.12","mocha":"^10.2.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^17.0.1","source-map-loader":"^4.0.0","typescript":"~5.3.3","typemoq":"^2.1.0","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/cloud-agnostic-core":"^2.1.0","@itwin/object-storage-core":"^2.2.2","@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","meshoptimizer":"~0.20.0","wms-capabilities":"0.4.0"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"}}');
+module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.7.0-dev.11","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 && npm run -s webpackWorkers && npm run -s copy:workers","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","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/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-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -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 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/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.7.0-dev.11","@itwin/core-bentley":"workspace:^4.7.0-dev.11","@itwin/core-common":"workspace:^4.7.0-dev.11","@itwin/core-geometry":"workspace:^4.7.0-dev.11","@itwin/core-orbitgt":"workspace:^4.7.0-dev.11","@itwin/core-quantity":"workspace:^4.7.0-dev.11"},"//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.2","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/mocha":"^10.0.6","@types/sinon":"^17.0.2","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.3.10","chai-as-promised":"^7.1.1","cpx2":"^3.0.0","eslint":"^8.56.0","glob":"^10.3.12","mocha":"^10.2.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^17.0.1","source-map-loader":"^4.0.0","typescript":"~5.3.3","typemoq":"^2.1.0","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/cloud-agnostic-core":"^2.1.0","@itwin/object-storage-core":"^2.2.2","@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","meshoptimizer":"~0.20.0","wms-capabilities":"0.4.0"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"}}');
 
 /***/ })