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

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 = {}));
 
 
@@ -57054,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;
@@ -57061,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) {
@@ -68317,7 +68321,8 @@ class SchemaJsonLocater {
      * @throws [ECObjectsError]($ecschema-metadata) if the schema exists, but cannot be loaded.
      */
     async getSchema(schemaKey, matchType, context) {
-        return this.getSchemaSync(schemaKey, matchType, context);
+        await this.getSchemaInfo(schemaKey, matchType, context);
+        return await context.getCachedSchema(schemaKey, matchType);
     }
     /**
      * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
@@ -68325,7 +68330,13 @@ class SchemaJsonLocater {
      * @param matchType The match type to use when locating the schema
      */
     async getSchemaInfo(schemaKey, matchType, context) {
-        return this.getSchema(schemaKey, matchType, context);
+        const schemaProps = this._getSchema(schemaKey.name);
+        if (!schemaProps)
+            return undefined;
+        const schemaInfo = await Schema_1.Schema.startLoadingFromJson(schemaProps, context);
+        if (schemaInfo !== undefined && schemaInfo.schemaKey.matches(schemaKey, matchType))
+            return schemaInfo;
+        return undefined;
     }
     /** Get a schema by [SchemaKey] synchronously.
      * @param schemaKey The [SchemaKey] that identifies the schema.
@@ -76067,10 +76078,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);
@@ -87507,7 +87518,7 @@ class SubCategoriesCache {
 (function (SubCategoriesCache) {
     class Request {
         get wasCanceled() { return this._canceled || this._imodel.isClosed; }
-        constructor(categoryIds, imodel, maxCategoriesPerQuery = 200) {
+        constructor(categoryIds, imodel, maxCategoriesPerQuery = 2500) {
             this._categoryIds = [];
             this._result = [];
             this._canceled = false;
@@ -166239,7 +166250,9 @@ class ToolAdmin {
          */
         this.manipulatorToolEvent = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BeEvent();
     }
-    /** The name of the [[PrimitiveTool]] to use as the default tool. Defaults to "Select", referring to [[SelectionTool]].
+    /** The name of the [[PrimitiveTool]] to use as the default tool.
+     * Defaults to "Select", referring to [[SelectionTool]].
+     * @note An empty string signifies no default tool allowing more events to be handled by [[idleTool]].
      * @see [[startDefaultTool]] to activate the default tool.
      * @see [[defaultToolArgs]] to supply arguments when starting the tool.
      */
@@ -167205,9 +167218,15 @@ class ToolAdmin {
         this.onActiveToolChanged(newTool, StartOrResume.Start);
     }
     /** @internal */
+    setEditCommandHandler(handler) {
+        this._editCommandHandler = handler;
+    }
+    /** @internal */
     async setPrimitiveTool(newTool) {
         if (undefined !== this._primitiveTool) {
             await this._primitiveTool.onCleanup();
+            if (undefined !== this._editCommandHandler)
+                await this._editCommandHandler.finishCommand();
             this._primitiveTool = undefined;
         }
         this._primitiveTool = newTool;
@@ -167291,15 +167310,25 @@ class ToolAdmin {
         }
     }
     /**
-     * Starts the default [[Tool]], if any. Generally invoked automatically when other tools exit, so shouldn't be called directly.
-     * @note The default tool is expected to be a subclass of [[PrimitiveTool]]. A call to startDefaultTool is required to terminate
-     * an active [[ViewTool]] or [[InputCollector]] and replace or clear the current [[PrimitiveTool]].
+     * Starts the default [[PrimitiveTool]], if any. Generally invoked automatically when other tools exit, so shouldn't be called directly.
+     * @note The default tool, when specified, must be a subclass of [[PrimitiveTool]]. A call to startDefaultTool is required to terminate
+     * an active [[ViewTool]] or [[InputCollector]] and replace or clear the current [[PrimitiveTool]]. The default tool can not be
+     * a subclass of [[ViewTool]] as view tools replace each other and aren't suspended. This means [[ViewTool.exitTool]] would
+     * result in the active tool being undefined instead of making the default tool active.
      * The tool's [[Tool.run]] method is invoked with arguments specified by [[defaultToolArgs]].
      * @see [[defaultToolId]] to configure the default tool.
      */
     async startDefaultTool() {
-        if (!await _IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.tools.run(this.defaultToolId, this.defaultToolArgs))
-            return this.startPrimitiveTool(undefined);
+        const tool = _IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.tools.create(this.defaultToolId, this.defaultToolArgs);
+        if (tool instanceof _PrimitiveTool__WEBPACK_IMPORTED_MODULE_12__.PrimitiveTool) {
+            if (!await tool.run(this.defaultToolArgs))
+                return this.startPrimitiveTool(undefined);
+        }
+        else {
+            await this.startPrimitiveTool(undefined); // Ensure active primitive tool is terminated...
+            if (undefined !== tool)
+                throw new Error("Default tool must be a subclass of PrimitiveTool");
+        }
     }
     /**
      * Call from external events or immediate tools that may have invalidated the current primitive tool's state.
@@ -203532,11 +203561,12 @@ class Angle {
             && dotUV * dotUV <= _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.smallAngleRadiansSquared * dotUU * dotVV;
     }
     /**
-     * Return cosine, sine, and radians for the half angle of a "cosine,sine" pair.
-     * * This function assumes the input arguments are related to an angle between -PI and PI
-     * * This function returns an angle between -PI and PI
-     * @param rCos2A cosine value (scaled by radius) for initial angle.
-     * @param rSin2A sine value (scaled by radius) for final angle.
+     * Compute the angle A given r*cos(2A) and r*sin(2A) for some nonnegative scalar r.
+     * * This function assumes the input arguments are related to an angle between -PI and PI.
+     * * This function returns an angle between -PI and PI.
+     * @param rCos2A scaled cosine value of twice the angle A.
+     * @param rSin2A scaled sine value of twice the angle A.
+     * @return cos(A), sin(A) and A in radians
      */
     static trigValuesToHalfAngleTrigValues(rCos2A, rSin2A) {
         const r = _Geometry__WEBPACK_IMPORTED_MODULE_0__.Geometry.hypotenuseXY(rCos2A, rSin2A);
@@ -203546,41 +203576,25 @@ class Angle {
         else {
             /* If the caller really gave you sine and cosine values, r should be 1.  However,
              * to allow scaled values -- e.g. the x and y components of any vector -- we normalize
-             * right here. This adds an extra sqrt and 2 divides to the whole process, but improves
+             * right here. This adds an extra sqrt and two divisions, but improves
              * both the usefulness and robustness of the computation.
              */
             let cosA;
             let sinA = 0.0;
             const cos2A = rCos2A / r;
             const sin2A = rSin2A / r;
-            // Original angle in NE and SE quadrants. Half angle in same quadrant
-            if (cos2A >= 0.0) {
-                /*
-                 * We know cos2A = (cosA)^2 - (sinA)^2 and 1 = (cosA)^2 + (sinA)^2
-                 * so 1 + cos2A = 2(cosA)^2 and therefore, cosA = sqrt((1+cos2A)/2)
-                 * cosine is positive in NE and SE quadrants so we use +sqrt
-                 */
-                cosA = Math.sqrt(0.5 * (1.0 + cos2A));
-                // We know sin2A = 2 sinA cosA so sinA = sin2A/(2*cosA)
-                sinA = sin2A / (2.0 * cosA);
+            if (cos2A >= 0.0) { // 2A is in NE and SE quadrants, A in same quadrant
+                cosA = Math.sqrt(0.5 * (1.0 + cos2A)); // half angle formula. Use +root since cosA >= 0
+                sinA = sin2A / (2.0 * cosA); // double angle formula
             }
             else {
-                // Original angle in NW quadrant. Half angle in NE quadrant
-                if (sin2A > 0.0) {
-                    /*
-                     * We know cos2A = (cosA)^2 - (sinA)^2 and 1 = (cosA)^2 + (sinA)^2
-                     * so 1 - cos2A = 2(sinA)^2 and therefore, sinA = sqrt((1-cos2A)/2)
-                     * sine is positive in NE quadrant so we use +sqrt
-                     */
-                    sinA = Math.sqrt(0.5 * (1.0 - cos2A));
-                    // Original angle in SW quadrant. Half angle in SE quadrant
+                if (sin2A > 0.0) { // 2A in NW quadrant. A in NE quadrant
+                    sinA = Math.sqrt(0.5 * (1.0 - cos2A)); // half angle formula. Use +root since sinA > 0
                 }
-                else {
-                    // sine is negative in SE quadrant so we use -sqrt
-                    sinA = -Math.sqrt(0.5 * (1.0 - cos2A));
+                else { // 2A in SW quadrant. A in SE quadrant
+                    sinA = -Math.sqrt(0.5 * (1.0 - cos2A)); // half angle formula. Use -root since sinA <= 0
                 }
-                // We know sin2A = 2 sinA cosA so cosA = sin2A/(2*sinA)
-                cosA = sin2A / (2.0 * sinA); // always positive
+                cosA = sin2A / (2.0 * sinA); // double angle formula
             }
             return { c: cosA, s: sinA, radians: Math.atan2(sinA, cosA) };
         }
@@ -203599,18 +203613,19 @@ class Angle {
         return value;
     }
     /**
-     * Return the half angle cosine, sine, and radians for given dot products between vectors. The vectors define
-     * an ellipse using x(t) = c + U cos(t) + V sin(t) so U and V are at angle t=0 degree and t=90 degree. The
-     * half angle t0 is an angle such that x(t0) is one of the ellipse semi-axis.
-     * * This construction arises e.g. in `Arc3d.toScaledMatrix3d`.
-     * * Given ellipse x(t) = c + U cos(t) + V sin(t), find t0 such that radial vector W(t0) = x(t0) - c is
-     * perpendicular to the ellipse.
+     * Return the half angle cosine, sine, and radians for the given vector dot products.
+     * * These values arise e.g. in the computation performed in `Arc3d.toScaledMatrix3d`.
+     * * Let vectors U and V define the ellipse x(t) = c + U cos(t) + V sin(t). We seek an angle t0
+     * such that the radial vector W(t0) := x(t0) - c is perpendicular to the ellipse.
      * * Then 0 = W(t0).x'(t0) = (U cos(t0) + V sin(t0)).(V cos(t0) - U sin(t0)) = U.V cos(2t0) + 0.5 (V.V - U.U) sin(2t0)
-     * implies sin(2t0) / cos(2t0) = 2 U.V / (U.U - V.V), i.e., t0 can be computed given the three dot products on the RHS.
-     * math details can be found at docs/learning/geometry/Angle.md
+     * implies tan(2t0) = sin(2t0) / cos(2t0) = 2 U.V / (U.U - V.V), i.e., t0 can be computed given the input dot products.
+     * Math details can be found at docs/learning/geometry/Angle.md
      * @param dotUU dot product of vectorU with itself
      * @param dotVV dot product of vectorV with itself
      * @param dotUV dot product of vectorU with vectorV
+     * @param favorZero whether to allow a tight tolerance for returning t0 = 0 (default true).
+     * When dotUV is near zero, U and V are nearly perpendicular, and the returned angle is near zero.
+     * @return the angle t0 and its cosine and sine.
      */
     static dotProductsToHalfAngleTrigValues(dotUU, dotVV, dotUV, favorZero = true) {
         const cos2t0 = dotUU - dotVV;
@@ -233789,6 +233804,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "IndexedPolyfaceVisitor": () => (/* binding */ IndexedPolyfaceVisitor)
 /* harmony export */ });
 /* 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_3__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.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_PolygonOps__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../geometry3d/PolygonOps */ "../../core/geometry/lib/esm/geometry3d/PolygonOps.js");
+/* harmony import */ var _Polyface__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Polyface */ "../../core/geometry/lib/esm/polyface/Polyface.js");
 /* harmony import */ var _PolyfaceData__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./PolyfaceData */ "../../core/geometry/lib/esm/polyface/PolyfaceData.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
@@ -233799,6 +233818,10 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 
+
+
+
+
 /* eslint-disable @itwin/prefer-get */
 /**
  * An `IndexedPolyfaceVisitor` is an iterator-like object that "visits" facets of a mesh.
@@ -233822,6 +233845,10 @@ class IndexedPolyfaceVisitor extends _PolyfaceData__WEBPACK_IMPORTED_MODULE_0__.
     clientPolyface() {
         return this._polyface;
     }
+    /** Return the number of facets this visitor is able to visit. */
+    getVisitableFacetCount() {
+        return this._polyface.facetCount;
+    }
     /**
      * Set the number of vertices replicated in visitor arrays (both data and index arrays).
      * * 0,1,2 are the most common as numWrap.
@@ -233966,53 +233993,99 @@ class IndexedPolyfaceVisitor extends _PolyfaceData__WEBPACK_IMPORTED_MODULE_0__.
 /**
  * An `IndexedPolyfaceSubsetVisitor` is an `IndexedPolyfaceVisitor` which only visits a subset of facets in the polyface.
  * * The subset is defined by an array of facet indices provided when this visitor is created.
- * * Within the subset visitor, `facetIndex` is understood as index within the subset array:
- *   * `moveToNextFacet` moves only within the subset.
- *   * `moveToReadIndex(i)` moves underlying visitor's `parentFacetIndex(i)`.
+ * * Input indices (e.g., for `moveToReadIndex`) are understood to be indices into the subset array.
  * @public
  */
 class IndexedPolyfaceSubsetVisitor extends IndexedPolyfaceVisitor {
     constructor(polyface, activeFacetIndices, numWrap) {
         super(polyface, numWrap);
         this._parentFacetIndices = activeFacetIndices.slice();
+        this._currentActiveIndex = -1;
         this._nextActiveIndex = 0;
     }
+    isValidSubsetIndex(index) {
+        return (undefined !== this._parentFacetIndices) && index >= 0 && index < this._parentFacetIndices.length;
+    }
     /**
      * Create a visitor for iterating a subset of the facets of `polyface`.
-     * * The `activeFacetIndices` array indicates all facets to be visited.
+     * @param polyface reference to the client polyface, supplying facets
+     * @param activeFacetIndices array of indices of facets in the client polyface to visit. This array is cloned.
+     * @param numWrap number of vertices replicated in the visitor arrays to facilitate simpler caller code. Default is zero.
      */
-    static createSubsetVisitor(polyface, activeFacetIndices, numWrap) {
+    static createSubsetVisitor(polyface, activeFacetIndices, numWrap = 0) {
         return new IndexedPolyfaceSubsetVisitor(polyface, activeFacetIndices, numWrap);
     }
-    /** Advance the iterator to a particular facet in the client polyface. */
+    /**
+     * Advance the iterator to a particular facet in the subset of client polyface facets.
+     * @param activeIndex the index of the facet within the subset, not to be confused with the index of the facet within the client polyface.
+     * @return whether the iterator was successfully moved.
+     */
     moveToReadIndex(activeIndex) {
-        if (activeIndex >= 0 && activeIndex <= this._parentFacetIndices.length) {
-            this._nextActiveIndex = activeIndex;
-            return super.moveToReadIndex(this._parentFacetIndices[activeIndex++]);
+        if (this.isValidSubsetIndex(activeIndex)) {
+            this._currentActiveIndex = activeIndex;
+            this._nextActiveIndex = activeIndex + 1;
+            return super.moveToReadIndex(this._parentFacetIndices[activeIndex]);
         }
         return false;
     }
-    /** Advance the iterator to the next facet in the client polyface. */
+    /**
+     * Advance the iterator to the next facet in the subset of client polyface facets.
+     * @return whether the iterator was successfully moved.
+     */
     moveToNextFacet() {
-        if (this._nextActiveIndex < this._parentFacetIndices.length) {
-            const result = this.moveToReadIndex(this._nextActiveIndex);
-            if (result) {
-                this._nextActiveIndex++;
-                return true;
-            }
-        }
-        return false;
+        if (this._nextActiveIndex !== this._currentActiveIndex)
+            return this.moveToReadIndex(this._nextActiveIndex);
+        this._nextActiveIndex++;
+        return true;
     }
-    /** Reset the iterator to start at the first active facet in the polyface. */
+    /** Reset the iterator to start at the first active facet in the subset of client polyface facets. */
     reset() {
-        this._nextActiveIndex = 0;
+        this.moveToReadIndex(0);
+        this._nextActiveIndex = 0; // so immediate moveToNextFacet stays here.
     }
-    /** Return the parent facet index of the indicated index within the active facets. */
+    /**
+     * Return the parent facet index of the indicated index within the subset of client polyface facets.
+     * @param activeIndex index of the facet within the subset. Default is the active facet.
+     * @return valid client polyface facet index, or `undefined` if invalid input index.
+     */
     parentFacetIndex(activeIndex) {
-        if (activeIndex >= 0 && activeIndex <= this._nextActiveIndex) {
-            return this._parentFacetIndices[activeIndex];
+        if (undefined === activeIndex)
+            activeIndex = this._currentActiveIndex;
+        return this.isValidSubsetIndex(activeIndex) ? this._parentFacetIndices[activeIndex] : undefined;
+    }
+    /** Return the number of facets this visitor is able to visit. */
+    getVisitableFacetCount() {
+        return this._parentFacetIndices ? this._parentFacetIndices.length : 0;
+    }
+    /**
+     * Create a visitor for those mesh facets with normal in the same half-space as the given vector.
+     * * For example, to visit the top facets of a tiled terrain mesh but skip the "skirt" facets, pass
+     * `compareVector = Vector3d.unitZ()` and a suitable `sideAngle` tolerance. Note that this will also
+     * filter out *interior* facets that are nearly vertical, not just the "skirt" facets on the boundary.
+     * @param mesh the mesh from which to select facets
+     * @param compareVector vector to which to compare facet normals. The visitor will visit only those facets
+     * with normals in the same half-space as this vector. Default is 001.
+     * @param sideAngle optional angular tolerance to filter the facets near the border between half-spaces.
+     * The visitor will *not* visit facets whose normals are nearly perpendicular to `compareVector`.
+     * Default is [[Geometry.smallAngleRadians]].
+     * @param numWrap optional number of entries replicated in visitor arrays. Default is 0.
+    */
+    static createNormalComparison(mesh, compareVector = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.unitZ(), sideAngle = _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_3__.Angle.createSmallAngle(), numWrap = 0) {
+        if (mesh instanceof _Polyface__WEBPACK_IMPORTED_MODULE_4__.IndexedPolyface)
+            return this.createNormalComparison(mesh.createVisitor(), compareVector, sideAngle, numWrap);
+        const visitor = mesh;
+        const facets = [];
+        const facetNormal = _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__.Vector3d.createZero();
+        for (visitor.reset(); visitor.moveToNextFacet();) {
+            if (!_geometry3d_PolygonOps__WEBPACK_IMPORTED_MODULE_5__.PolygonOps.unitNormal(visitor.point, facetNormal))
+                continue; // degenerate facet
+            if (facetNormal.dotProduct(compareVector) < 0.0)
+                continue; // ignore facet facing other half-space
+            if (facetNormal.angleFromPerpendicular(compareVector).isMagnitudeLessThanOrEqual(sideAngle))
+                continue; // ignore side facet
+            facets.push(visitor.currentReadIndex());
         }
-        return undefined;
+        return IndexedPolyfaceSubsetVisitor.createSubsetVisitor(visitor.clientPolyface(), facets, numWrap);
     }
 }
 
@@ -238356,40 +238429,22 @@ class PolyfaceQuery {
         return true;
     }
     /**
-     * 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.
+     * 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`.
-     * @returns true if all dihedral angles of the mesh are positive.
+     * 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.
-    * * 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 dihedralAngleSummary(source, ignoreBoundaries = false) {
         // more info can be found at geometry/internaldocs/Polyface.md
         const edges = new _IndexedEdgeMatcher__WEBPACK_IMPORTED_MODULE_10__.IndexedEdgeMatcher();
@@ -238445,9 +238500,23 @@ class PolyfaceQuery {
             return 0;
         return -2;
     }
-    /** 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 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 edges pairing in `source` mesh.
@@ -238471,36 +238540,9 @@ 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 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);
+    /** 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.
@@ -238551,6 +238593,37 @@ class PolyfaceQuery {
             }
         }
     }
+    /**
+     * 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.
@@ -238996,13 +239069,17 @@ class PolyfaceQuery {
         }
         return builder.claimPolyface(true);
     }
-    /** Return the point count of the `source`. */
+    /**
+     * Return the point count of the `source`.
+     * * If `source` is a visitor, this is an upper bound on the number of addressed mesh vertices.
+     */
     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;
+        const saveReadIndex = source.currentReadIndex();
         source.reset();
         let maxIndex = -1;
         while (source.moveToNextFacet()) {
@@ -239010,22 +239087,30 @@ class PolyfaceQuery {
                 if (pointIndex > maxIndex)
                     maxIndex = pointIndex;
         }
+        source.moveToReadIndex(saveReadIndex);
         return maxIndex + 1;
     }
-    /** Return the facet count of the `source`. */
+    /**
+     * Return the facet count of the `source`.
+     * * If `source` is a visitor, this is the number of facets it can visit.
+     */
     static visitorClientFacetCount(source) {
         if (source instanceof _Polyface__WEBPACK_IMPORTED_MODULE_6__.Polyface) {
             if (source.facetCount !== undefined)
                 return source.facetCount;
             source = source.createVisitor(0);
         }
+        if (source.getVisitableFacetCount)
+            return source.getVisitableFacetCount();
         const polyface = source.clientPolyface();
         if (polyface !== undefined && polyface.facetCount !== undefined)
             return polyface.facetCount;
+        const saveReadIndex = source.currentReadIndex();
         let facetCount = 0;
         source.reset();
         while (source.moveToNextFacet())
             ++facetCount;
+        source.moveToReadIndex(saveReadIndex);
         return facetCount;
     }
     /**
@@ -239330,21 +239415,6 @@ class PolyfaceQuery {
         }
         return 0;
     }
-    /**
-     * 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;
-    }
     /**
      * Announce facet duplicates.
      * @returns an array of arrays describing facet duplication. Each array `entry` in the output contains read
@@ -239393,10 +239463,25 @@ class PolyfaceQuery {
         }
     }
     /**
-     * Return a new facet set with a subset of facets in polyface.
+     * 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 from the source facets, specifying how to copy duplicate facets.
      * @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 to copy 0, 1, or all facets in each cluster of duplicate facets.
      */
     static cloneByFacetDuplication(source, includeSingletons, clusterSelector) {
         const builder = _PolyfaceBuilder__WEBPACK_IMPORTED_MODULE_16__.PolyfaceBuilder.create();
@@ -257034,8 +257119,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "TorusPipe": () => (/* binding */ TorusPipe)
 /* harmony export */ });
-/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
-/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
+/* harmony import */ var _curve_Arc3d__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../curve/Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
+/* harmony import */ var _curve_Loop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../curve/Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
 /* harmony import */ var _curve_Path__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../curve/Path */ "../../core/geometry/lib/esm/curve/Path.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_3__ = __webpack_require__(/*! ../geometry3d/Angle */ "../../core/geometry/lib/esm/geometry3d/Angle.js");
@@ -257062,23 +257147,27 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /**
- * A torus pipe is a partial torus (donut).  In a local coordinate system
- * * The z axis passes through the hole.
- * * The "major hoop" arc has
- *   * vectorTheta0 = (radiusA, 0, 0)
- *   * vectorTheta90 = (0, radiusA, 0)
- *   * The major arc point at angle theta is `C(theta) = vectorTheta0 * cos(theta) + vectorTheta90 * sin(theta)
- * * The minor hoop at theta various with phi "around the minor hoop"
- *    * (x,y,z) = C(theta) + (radiusB * cos(theta), radiusB * sin(theta), 0) * cos(phi) + (0, 0, radiusB) * sin(phi)
+ * A torus pipe is a partial torus (donut).
+ * * In its local coordinate system, the z-axis passes through the donut hole.
+ * * The "major hoop" circular arc is defined for theta in the angular sweep. Its formula in local coordinates:
+ *   * `vectorTheta0 = (radiusA, 0, 0)`
+ *   * `vectorTheta90 = (0, radiusA, 0)`
+ *   * `M(theta) = vectorTheta0 * cos(theta) + vectorTheta90 * sin(theta)`
+ * * The "minor hoop" circular arc is defined for phi in [0,2pi]. Its formula, centered at the origin:
+ *   * `vectorPhi0 = (radiusB * cos(theta), radiusB * sin(theta), 0)`
+ *   * `vectorPhi90 = (0, 0, radiusB)`
+ *   * `m(phi) = vectorPhi0 * cos(phi) + vectorPhi90 * sin(phi)`
+ * * Thus the torus pipe in local coordinates has the formula:
+ *   * `T(theta, phi) = M(theta) + m(phi)`
  * * The stored form of the torus pipe is oriented for positive volume:
  *   * Both radii are positive, with radiusA >= radiusB > 0
  *   * The sweep is positive
  *   * The coordinate system has positive determinant.
  * * For uv parameterization,
- *   * u is around the minor hoop, with (0..1) mapping to phi of (0 degrees ..360 degrees)
- *   * v is along the major hoop with (0..1) mapping to theta of (0 .. sweep)
+ *   * u is around the minor hoop, with u in [0,1] mapping to phi in [0, 2pi]
+ *   * v is along the major hoop, with v in [0,1] mapping to theta in the angular sweep
  *   * a constant v section is a full circle
- *   * a constant u section is an arc with sweep angle matching the torusPipe sweep angle.
+ *   * a constant u section is an arc with the same angular sweep as the torusPipe
  * @public
  */
 class TorusPipe extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimitive {
@@ -257157,14 +257246,22 @@ class TorusPipe extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimit
         const frame = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_2__.Transform.createOriginAndMatrixColumns(center, vectorX, vectorY, vectorZ);
         return TorusPipe.createInFrame(frame, majorRadius, minorRadius, sweep, capped);
     }
-    /** Create a TorusPipe from its primary arc and minor radius */
+    /**
+     * Create a TorusPipe from major arc and minor radius.
+     * For best results, `arc` should be circular; otherwise, circularity is coerced.
+     */
     static createAlongArc(arc, minorRadius, capped) {
         if (!_geometry3d_Angle__WEBPACK_IMPORTED_MODULE_3__.Angle.isAlmostEqualRadiansAllowPeriodShift(0.0, arc.sweep.startRadians))
             arc = arc.cloneInRotatedBasis(arc.sweep.startAngle);
-        const sweepRadians = arc.sweep.sweepRadians;
+        if (!arc.isCircular) { // ensure circularity by squaring the axes and equating their lengths
+            const perpVector90 = arc.perpendicularVector.sizedCrossProduct(arc.vector0, arc.matrixRef.columnXMagnitude());
+            if (!perpVector90)
+                return undefined;
+            arc = _curve_Arc3d__WEBPACK_IMPORTED_MODULE_4__.Arc3d.create(arc.center, arc.vector0, perpVector90, arc.sweep);
+        }
         const data = arc.toScaledMatrix3d();
-        const frame = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_2__.Transform.createOriginAndMatrix(data.center, data.axes);
-        return TorusPipe.createInFrame(frame, data.r0, minorRadius, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_3__.Angle.createRadians(sweepRadians), capped);
+        const rigidFrame = _geometry3d_Transform__WEBPACK_IMPORTED_MODULE_2__.Transform.createOriginAndMatrix(arc.center, data.axes);
+        return TorusPipe.createInFrame(rigidFrame, data.r0, minorRadius, _geometry3d_Angle__WEBPACK_IMPORTED_MODULE_3__.Angle.createRadians(arc.sweep.sweepRadians), capped);
     }
     /** Return a coordinate frame (right handed, unit axes)
      * * origin at center of major circle
@@ -257251,7 +257348,7 @@ class TorusPipe extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimit
         const center = this._localToWorld.multiplyXYZ(majorRadius * c0, majorRadius * s0, 0);
         const vector0 = this._localToWorld.multiplyVectorXYZ(minorRadius * c0, minorRadius * s0, 0);
         const vector90 = this._localToWorld.multiplyVectorXYZ(0, 0, minorRadius);
-        return _curve_Loop__WEBPACK_IMPORTED_MODULE_4__.Loop.create(_curve_Arc3d__WEBPACK_IMPORTED_MODULE_5__.Arc3d.create(center, vector0, vector90));
+        return _curve_Loop__WEBPACK_IMPORTED_MODULE_5__.Loop.create(_curve_Arc3d__WEBPACK_IMPORTED_MODULE_4__.Arc3d.create(center, vector0, vector90));
     }
     /** Return an arc at constant u, and arc sweep matching this TorusPipe sweep. */
     constantUSection(uFraction) {
@@ -257265,7 +257362,7 @@ class TorusPipe extends _SolidPrimitive__WEBPACK_IMPORTED_MODULE_0__.SolidPrimit
         const rxy = majorRadius + minorRadius * Math.cos(phiRadians);
         const vector0 = axes.multiplyXYZ(rxy, 0, 0);
         const vector90 = axes.multiplyXYZ(0, rxy, 0);
-        return _curve_Path__WEBPACK_IMPORTED_MODULE_6__.Path.create(_curve_Arc3d__WEBPACK_IMPORTED_MODULE_5__.Arc3d.create(center, vector0, vector90, _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_7__.AngleSweep.createStartEndRadians(0.0, theta1Radians)));
+        return _curve_Path__WEBPACK_IMPORTED_MODULE_6__.Path.create(_curve_Arc3d__WEBPACK_IMPORTED_MODULE_4__.Arc3d.create(center, vector0, vector90, _geometry3d_AngleSweep__WEBPACK_IMPORTED_MODULE_7__.AngleSweep.createStartEndRadians(0.0, theta1Radians)));
     }
     /** extend `rangeToExtend` to include this `TorusPipe` */
     extendRange(rangeToExtend, transform) {
@@ -282543,6 +282640,10 @@ class Parser {
         }
         // common case where single value and single label are supplied
         if (tokens.length === 2) {
+            // unit specification comes before value (like currency)
+            if (tokens[1].isNumber && tokens[0].isString) {
+                tokens = [tokens[1], tokens[0]];
+            }
             if (tokens[0].isNumber && tokens[1].isString) {
                 const unit = await this.lookupUnitByLabel(tokens[1].value, format, unitsProvider, altUnitLabelsProvider);
                 if (undefined === defaultUnit)
@@ -282556,21 +282657,6 @@ class Parser {
                     return new _Quantity__WEBPACK_IMPORTED_MODULE_2__.Quantity(defaultUnit, mag);
                 }
             }
-            else { // unit specification comes before value (like currency)
-                if (tokens[1].isNumber && tokens[0].isString) {
-                    const unit = await this.lookupUnitByLabel(tokens[0].value, format, unitsProvider, altUnitLabelsProvider);
-                    if (undefined === defaultUnit)
-                        defaultUnit = unit;
-                    if (defaultUnit && defaultUnit.name === unit.name) {
-                        return new _Quantity__WEBPACK_IMPORTED_MODULE_2__.Quantity(defaultUnit, tokens[1].value);
-                    }
-                    else if (defaultUnit) {
-                        const conversion = await unitsProvider.getConversion(unit, defaultUnit);
-                        const mag = ((tokens[1].value * conversion.factor)) + conversion.offset;
-                        return new _Quantity__WEBPACK_IMPORTED_MODULE_2__.Quantity(defaultUnit, mag);
-                    }
-                }
-            }
         }
         // common case where there are multiple value/label pairs
         if (tokens.length % 2 === 0) {
@@ -282682,8 +282768,16 @@ class Parser {
         }
         // common case where single value and single label are supplied
         if (tokens.length === 2) {
+            // unit specification comes before value (like currency)
+            if (tokens[1].isNumber && tokens[0].isString) {
+                tokens = [tokens[1], tokens[0]];
+            }
             if (tokens[0].isNumber && tokens[1].isString) {
-                const conversion = Parser.tryFindUnitConversion(tokens[1].value, unitsConversions, defaultUnit);
+                let conversion = Parser.tryFindUnitConversion(tokens[1].value, unitsConversions, defaultUnit);
+                // if no conversion, ignore value in second token. If we have defaultUnit, use it.
+                if (!conversion && defaultUnit) {
+                    conversion = Parser.tryFindUnitConversion(defaultUnit.label, unitsConversions, defaultUnit);
+                }
                 if (conversion) {
                     const value = tokens[0].value * conversion.factor + conversion.offset;
                     return { ok: true, value };
@@ -282691,17 +282785,6 @@ class Parser {
                 // if no conversion, just return parsed number and ignore value in second token
                 return { ok: true, value: tokens[0].value };
             }
-            else { // unit specification comes before value (like currency)
-                if (tokens[1].isNumber && tokens[0].isString) {
-                    const conversion = Parser.tryFindUnitConversion(tokens[0].value, unitsConversions, defaultUnit);
-                    if (conversion) {
-                        const value = tokens[1].value * conversion.factor + conversion.offset;
-                        return { ok: true, value };
-                    }
-                    // if no conversion, just return parsed number and ignore value in second token
-                    return { ok: true, value: tokens[1].value };
-                }
-            }
         }
         // common case where there are multiple value/label pairs
         if (tokens.length % 2 === 0) {
@@ -297375,7 +297458,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.7.0-dev.8","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.8","@itwin/core-bentley":"workspace:^4.7.0-dev.8","@itwin/core-common":"workspace:^4.7.0-dev.8","@itwin/core-geometry":"workspace:^4.7.0-dev.8","@itwin/core-orbitgt":"workspace:^4.7.0-dev.8","@itwin/core-quantity":"workspace:^4.7.0-dev.8"},"//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"}}');
+module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"4.8.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.8.0-dev.0","@itwin/core-bentley":"workspace:^4.8.0-dev.0","@itwin/core-common":"workspace:^4.8.0-dev.0","@itwin/core-geometry":"workspace:^4.8.0-dev.0","@itwin/core-orbitgt":"workspace:^4.8.0-dev.0","@itwin/core-quantity":"workspace:^4.8.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.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"}}');
 
 /***/ })