brepjs 9.3.9 → 9.3.10

package/dist/2d/blueprints/intersectionSegments.d.ts

@@ -1,5 +1,11 @@
+import { Point2D } from '../lib/index.js';
 import { default as Blueprint } from './Blueprint.js';
 import { IntersectionSegment } from './booleanHelpers.js';
+/**
+ * Check whether a segment's start/end points match one of the common segment
+ * point pairs.
+ */
+export declare function isCommonSegmentMatch(commonSegmentsPoints: Point2D[][], segmentStart: Point2D, segmentEnd: Point2D): boolean;
 /**
  * Given two closed blueprints, find their intersection points, split each
  * blueprint's curves at those points, and pair up the resulting segments.

package/dist/2d/blueprints/intersectionSegments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intersectionSegments.d.ts","sourceRoot":"","sources":["../../../src/2d/blueprints/intersectionSegments.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAY5C,OAAO,KAAK,EAAW,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAgKxE;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAChB,mBAAmB,EAAE,GAAG,IAAI,CAwE9B"}
+{"version":3,"file":"intersectionSegments.d.ts","sourceRoot":"","sources":["../../../src/2d/blueprints/intersectionSegments.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,iBAAiB,CAAC;AAGxD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAY5C,OAAO,KAAK,EAAW,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AA0IxE;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,OAAO,EAAE,EAAE,EACjC,YAAY,EAAE,OAAO,EACrB,UAAU,EAAE,OAAO,GAClB,OAAO,CAQT;AAMD;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAChB,mBAAmB,EAAE,GAAG,IAAI,CAwE9B"}

package/dist/2d/lib/offset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offset.d.ts","sourceRoot":"","sources":["../../../src/2d/lib/offset.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAmBhD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,OAAO,EACd,QAAQ,MAAM,KACb,OAAO,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAuEtE,CAAC"}
+{"version":3,"file":"offset.d.ts","sourceRoot":"","sources":["../../../src/2d/lib/offset.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAmBhD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,YAAY,GACvB,OAAO,OAAO,EACd,QAAQ,MAAM,KACb,OAAO,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CA4EtE,CAAC"}

package/dist/2d.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Blueprint = require("./Blueprint-C_ny87tf.cjs");
-const boolean2D = require("./boolean2D-C_WtQSZM.cjs");
+const Blueprint = require("./Blueprint-CYDtiBRw.cjs");
+const boolean2D = require("./boolean2D-FaadcaJX.cjs");
 function reverseCurve(curve) {
   const cloned = curve.clone();
   cloned.reverse();

package/dist/2d.js

@@ -1,6 +1,6 @@
-import { B as Blueprint } from "./Blueprint-vLo9HuPx.js";
-import { d, C } from "./Blueprint-vLo9HuPx.js";
-import { e, C as C2, f, l, g, n, k, q, o, p, r } from "./boolean2D-G9wVVewF.js";
+import { B as Blueprint } from "./Blueprint-DBFQJ5ME.js";
+import { d, C } from "./Blueprint-DBFQJ5ME.js";
+import { e, C as C2, f, l, g, n, k, q, o, p, r } from "./boolean2D-BDRf7DqS.js";
 function reverseCurve(curve) {
   const cloned = curve.clone();
   cloned.reverse();

package/dist/{Blueprint-C_ny87tf.cjs → Blueprint-CYDtiBRw.cjs}

@@ -1,13 +1,13 @@
 "use strict";
-const vectors = require("./vectors-BwRTfFd1.cjs");
+const vectors = require("./vectors-DqQXtR8s.cjs");
 const types = require("./types-CA_xrgDq.cjs");
 const shapeTypes = require("./shapeTypes-CBhj5o2y.cjs");
-const faceFns = require("./faceFns-A6VJdsJc.cjs");
-const curveFns = require("./curveFns-BsxQJoWM.cjs");
-const errors = require("./errors-HU7EpHt3.cjs");
-const helpers = require("./helpers-C-dHgprx.cjs");
+const faceFns = require("./faceFns-Cshr6Dql.cjs");
+const curveFns = require("./curveFns-DOhZedkN.cjs");
+const errors = require("./errors-DiTn5EoC.cjs");
+const helpers = require("./helpers-aY6tdIRv.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const surfaceBuilders = require("./surfaceBuilders-DwMD54OR.cjs");
+const surfaceBuilders = require("./surfaceBuilders-mE9oGh7r.cjs");
 const result = require("./result.cjs");
 function makePlane(plane, origin) {
   if (plane && typeof plane !== "string") {

package/dist/{Blueprint-vLo9HuPx.js → Blueprint-DBFQJ5ME.js}

@@ -1,12 +1,12 @@
-import { r as resolvePlane } from "./vectors-CpZfWX0T.js";
+import { r as resolvePlane } from "./vectors-B8RRTytu.js";
 import { a as toVec3 } from "./types-CWDdqcrq.js";
 import { q as getKernel, y as getKernel2D, z as registerForCleanup, A as unregisterFromCleanup, s as createEdge, r as createWire } from "./shapeTypes-d-jYnZuW.js";
-import { u as uvBounds, f as faceGeomType, e as faceCenter, h as uvCoordinates, c as cast } from "./faceFns-DKAs23b7.js";
-import { g as getOrientation } from "./curveFns-B7b2uHRl.js";
-import { o as ok, e as err, b as computationError, u as unwrap, x as validationError } from "./errors-C_XjfNt5.js";
-import { d as distance2d, s as samePoint, b as scalarMultiply2d, c as add2d, n as normalize2d, e as subtract2d, g as getSingleFace } from "./helpers-BidbwB1g.js";
+import { u as uvBounds, f as faceGeomType, e as faceCenter, h as uvCoordinates, c as cast } from "./faceFns-FViaMujJ.js";
+import { g as getOrientation } from "./curveFns-BteO-W-V.js";
+import { o as ok, e as err, b as computationError, u as unwrap, x as validationError } from "./errors-lBwyc8YG.js";
+import { d as distance2d, s as samePoint, b as scalarMultiply2d, c as add2d, n as normalize2d, e as subtract2d, g as getSingleFace } from "./helpers-j3ILUOP3.js";
 import { R as RAD2DEG, D as DEG2RAD } from "./vecOps-ZDdZWbwT.js";
-import { m as makeFace } from "./surfaceBuilders-BX-btdhW.js";
+import { m as makeFace } from "./surfaceBuilders-C67Q29Gt.js";
 import { bug } from "./result.js";
 function makePlane(plane, origin) {
   if (plane && typeof plane !== "string") {

package/dist/{boolean2D-G9wVVewF.js → boolean2D-BDRf7DqS.js}

@@ -43,18 +43,18 @@ var __callDispose = (stack, error, hasError) => {
   };
   return next();
 };
-import { a as createPlane } from "./vectors-CpZfWX0T.js";
-import { o as ok, e as err, b as computationError, u as unwrap, g as isOk } from "./errors-C_XjfNt5.js";
-import { d as downcast, u as uvBounds, p as pointOnSurface, n as normalAt } from "./faceFns-DKAs23b7.js";
+import { a as createPlane } from "./vectors-B8RRTytu.js";
+import { o as ok, e as err, b as computationError, u as unwrap, g as isOk } from "./errors-lBwyc8YG.js";
+import { d as downcast, u as uvBounds, p as pointOnSurface, n as normalAt } from "./faceFns-FViaMujJ.js";
 import { a as toVec3 } from "./types-CWDdqcrq.js";
 import { n as vecScale, j as vecNormalize, b as vecCross, D as DEG2RAD, R as RAD2DEG } from "./vecOps-ZDdZWbwT.js";
-import { r as revolution, c as complexExtrude, t as twistExtrude, b as basicFaceExtrusion, g as genericSweep, l as loft } from "./loft-BI8MUcCF.js";
+import { r as revolution, c as complexExtrude, t as twistExtrude, b as basicFaceExtrusion, g as genericSweep, l as loft } from "./loft-CiXi_aga.js";
 import { y as getKernel2D, t as createFace, r as createWire, q as getKernel, s as createEdge, D as DisposalScope } from "./shapeTypes-d-jYnZuW.js";
-import { d as curveStartPoint, c as curveTangentAt, e as curveIsClosed } from "./curveFns-B7b2uHRl.js";
-import { m as makeFace, l as makeNewFaceWithinFace, b as assembleWire, z as zip } from "./surfaceBuilders-BX-btdhW.js";
+import { d as curveStartPoint, c as curveTangentAt, e as curveIsClosed } from "./curveFns-BteO-W-V.js";
+import { m as makeFace, l as makeNewFaceWithinFace, b as assembleWire, z as zip } from "./surfaceBuilders-C67Q29Gt.js";
 import { bug } from "./result.js";
-import { s as samePoint$1, n as normalize2d, e as subtract2d, c as add2d, i as crossProduct2d, b as scalarMultiply2d, f as polarToCartesian, r as rotate2d, j as cartesianToPolar, d as distance2d, p as polarAngle2d, k as PRECISION_INTERSECTION } from "./helpers-BidbwB1g.js";
-import { C as Curve2D, a as make2dSegmentCurve, j as approximateAsBSpline, b as make2dArcFromCenter, k as isPoint2D, g as make2dCircle, l as make2dThreePointArc, d as BoundingBox2d, v as viewbox, n as asSVG, B as Blueprint, o as make2dEllipseArc, p as make2dTangentArc, q as make2dBezierCurve, r as removeDuplicatePoints } from "./Blueprint-vLo9HuPx.js";
+import { s as samePoint$1, n as normalize2d, e as subtract2d, c as add2d, i as crossProduct2d, b as scalarMultiply2d, f as polarToCartesian, r as rotate2d, j as cartesianToPolar, d as distance2d, p as polarAngle2d, k as PRECISION_INTERSECTION } from "./helpers-j3ILUOP3.js";
+import { C as Curve2D, a as make2dSegmentCurve, j as approximateAsBSpline, b as make2dArcFromCenter, k as isPoint2D, g as make2dCircle, l as make2dThreePointArc, d as BoundingBox2d, v as viewbox, n as asSVG, B as Blueprint, o as make2dEllipseArc, p as make2dTangentArc, q as make2dBezierCurve, r as removeDuplicatePoints } from "./Blueprint-DBFQJ5ME.js";
 const intersectCurves = (first, second, precision = 1e-9) => {
   if (first.boundingBox.isOut(second.boundingBox))
     return ok({ intersections: [], commonSegments: [], commonSegmentsPoints: [] });
@@ -1973,7 +1973,7 @@ function splitCurvesAtIntersections(curves, curvePoints) {
 function isCommonSegmentMatch(commonSegmentsPoints, segmentStart, segmentEnd) {
   return commonSegmentsPoints.some(([startPoint, endPoint]) => {
     if (startPoint === void 0 || endPoint === void 0) return false;
-    return samePoint(startPoint, segmentStart) && samePoint(endPoint, segmentEnd) || samePoint(startPoint, segmentEnd) && samePoint(startPoint, segmentStart);
+    return samePoint(startPoint, segmentStart) && samePoint(endPoint, segmentEnd) || samePoint(startPoint, segmentEnd) && samePoint(endPoint, segmentStart);
   });
 }
 function blueprintsIntersectionSegments(first, second) {

package/dist/{boolean2D-C_WtQSZM.cjs → boolean2D-FaadcaJX.cjs}

@@ -44,18 +44,18 @@ var __callDispose = (stack, error, hasError) => {
   };
   return next();
 };
-const vectors = require("./vectors-BwRTfFd1.cjs");
-const errors = require("./errors-HU7EpHt3.cjs");
-const faceFns = require("./faceFns-A6VJdsJc.cjs");
+const vectors = require("./vectors-DqQXtR8s.cjs");
+const errors = require("./errors-DiTn5EoC.cjs");
+const faceFns = require("./faceFns-Cshr6Dql.cjs");
 const types = require("./types-CA_xrgDq.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const loft = require("./loft-B0VRwdIS.cjs");
+const loft = require("./loft-6RVa269J.cjs");
 const shapeTypes = require("./shapeTypes-CBhj5o2y.cjs");
-const curveFns = require("./curveFns-BsxQJoWM.cjs");
-const surfaceBuilders = require("./surfaceBuilders-DwMD54OR.cjs");
+const curveFns = require("./curveFns-DOhZedkN.cjs");
+const surfaceBuilders = require("./surfaceBuilders-mE9oGh7r.cjs");
 const result = require("./result.cjs");
-const helpers = require("./helpers-C-dHgprx.cjs");
-const Blueprint = require("./Blueprint-C_ny87tf.cjs");
+const helpers = require("./helpers-aY6tdIRv.cjs");
+const Blueprint = require("./Blueprint-CYDtiBRw.cjs");
 const intersectCurves = (first, second, precision = 1e-9) => {
   if (first.boundingBox.isOut(second.boundingBox))
     return errors.ok({ intersections: [], commonSegments: [], commonSegmentsPoints: [] });
@@ -1974,7 +1974,7 @@ function splitCurvesAtIntersections(curves, curvePoints) {
 function isCommonSegmentMatch(commonSegmentsPoints, segmentStart, segmentEnd) {
   return commonSegmentsPoints.some(([startPoint, endPoint]) => {
     if (startPoint === void 0 || endPoint === void 0) return false;
-    return samePoint(startPoint, segmentStart) && samePoint(endPoint, segmentEnd) || samePoint(startPoint, segmentEnd) && samePoint(startPoint, segmentStart);
+    return samePoint(startPoint, segmentStart) && samePoint(endPoint, segmentEnd) || samePoint(startPoint, segmentEnd) && samePoint(endPoint, segmentStart);
   });
 }
 function blueprintsIntersectionSegments(first, second) {

package/dist/{booleanFns-G0j8iAZV.cjs → booleanFns-DHFR4zO7.cjs}

@@ -1,10 +1,10 @@
 "use strict";
 const shapeTypes = require("./shapeTypes-CBhj5o2y.cjs");
-const errors = require("./errors-HU7EpHt3.cjs");
-const vectors = require("./vectors-BwRTfFd1.cjs");
+const errors = require("./errors-DiTn5EoC.cjs");
+const vectors = require("./vectors-DqQXtR8s.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const shapeFns = require("./shapeFns-O9Ont1Dy.cjs");
-const surfaceBuilders = require("./surfaceBuilders-DwMD54OR.cjs");
+const shapeFns = require("./shapeFns-BvxOc2M_.cjs");
+const surfaceBuilders = require("./surfaceBuilders-mE9oGh7r.cjs");
 const shapeTagStore = /* @__PURE__ */ new WeakMap();
 const tagMetadataStore = /* @__PURE__ */ new WeakMap();
 function hasFaceTags(shape) {

package/dist/{booleanFns-gwskRu9F.js → booleanFns-GfGGPjuF.js}

@@ -1,9 +1,9 @@
 import { q as getKernel, c as castShape, j as isShape3D } from "./shapeTypes-d-jYnZuW.js";
-import { o as ok, d as isErr, e as err, x as validationError, B as BrepErrorCode, p as typeCastError, k as kernelError } from "./errors-C_XjfNt5.js";
-import { r as resolvePlane } from "./vectors-CpZfWX0T.js";
+import { o as ok, d as isErr, e as err, x as validationError, B as BrepErrorCode, p as typeCastError, k as kernelError } from "./errors-lBwyc8YG.js";
+import { r as resolvePlane } from "./vectors-B8RRTytu.js";
 import { H as HASH_CODE_MAX, n as vecScale, v as vecAdd } from "./vecOps-ZDdZWbwT.js";
-import { a as getFaces, p as propagateOriginsFromEvolution, b as propagateOriginsByHash, g as getFaceOrigins, c as getWires, d as getEdges, e as getVertices } from "./shapeFns-D9CKkCnS.js";
-import { m as makeFace } from "./surfaceBuilders-BX-btdhW.js";
+import { a as getFaces, p as propagateOriginsFromEvolution, b as propagateOriginsByHash, g as getFaceOrigins, c as getWires, d as getEdges, e as getVertices } from "./shapeFns-DvwUGuOx.js";
+import { m as makeFace } from "./surfaceBuilders-C67Q29Gt.js";
 const shapeTagStore = /* @__PURE__ */ new WeakMap();
 const tagMetadataStore = /* @__PURE__ */ new WeakMap();
 function hasFaceTags(shape) {

package/dist/brepjs.cjs

@@ -46,29 +46,29 @@ var __callDispose = (stack, error, hasError) => {
 };
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const shapeTypes = require("./shapeTypes-CBhj5o2y.cjs");
-const errors = require("./errors-HU7EpHt3.cjs");
+const errors = require("./errors-DiTn5EoC.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const Blueprint = require("./Blueprint-C_ny87tf.cjs");
-const loft$2 = require("./loft-B0VRwdIS.cjs");
-const operations = require("./operations-B1FSxszL.cjs");
-const boolean2D = require("./boolean2D-C_WtQSZM.cjs");
+const Blueprint = require("./Blueprint-CYDtiBRw.cjs");
+const loft$2 = require("./loft-6RVa269J.cjs");
+const operations = require("./operations-Ds393Tne.cjs");
+const boolean2D = require("./boolean2D-FaadcaJX.cjs");
 const _2d = require("./2d.cjs");
-const helpers = require("./helpers-C-dHgprx.cjs");
+const helpers = require("./helpers-aY6tdIRv.cjs");
 const io = require("./io.cjs");
-const drawFns = require("./drawFns-BIoGsiXr.cjs");
+const drawFns = require("./drawFns-4kaeEGpt.cjs");
 const types = require("./types-CA_xrgDq.cjs");
-const vectors = require("./vectors-BwRTfFd1.cjs");
-const shapeFns = require("./shapeFns-O9Ont1Dy.cjs");
-const booleanFns = require("./booleanFns-G0j8iAZV.cjs");
-const topology = require("./topology-ChR-we6s.cjs");
-const curveFns = require("./curveFns-BsxQJoWM.cjs");
-const faceFns = require("./faceFns-A6VJdsJc.cjs");
-const meshFns = require("./meshFns-ClCp7nft.cjs");
-const measurement = require("./measurement-D5XQSvln.cjs");
-const surfaceBuilders = require("./surfaceBuilders-DwMD54OR.cjs");
+const vectors = require("./vectors-DqQXtR8s.cjs");
+const shapeFns = require("./shapeFns-BvxOc2M_.cjs");
+const booleanFns = require("./booleanFns-DHFR4zO7.cjs");
+const topology = require("./topology-DKWBbtZ3.cjs");
+const curveFns = require("./curveFns-DOhZedkN.cjs");
+const faceFns = require("./faceFns-Cshr6Dql.cjs");
+const meshFns = require("./meshFns-xdRr7G4g.cjs");
+const measurement = require("./measurement-Crrs7ULW.cjs");
+const surfaceBuilders = require("./surfaceBuilders-mE9oGh7r.cjs");
 const query = require("./query.cjs");
 const result = require("./result.cjs");
-const cornerFinder = require("./cornerFinder-56x6NzUP.cjs");
+const cornerFinder = require("./cornerFinder-C1oci6gb.cjs");
 const worker = require("./worker.cjs");
 function supportsProjection(kernel) {
   return "projectShape" in kernel;
@@ -1170,6 +1170,12 @@ function roof(w, options) {
     return errors.err(errors.kernelError(errors.BrepErrorCode.ROOF_FAILED, `Roof generation failed: ${msg}`, e));
   }
 }
+const UNSUPPORTED_DOF = {
+  coincident: 3,
+  concentric: 4,
+  distance: 1,
+  angle: 1
+};
 function solveConstraints(nodes, constraints) {
   const transforms = /* @__PURE__ */ new Map();
   for (const node of nodes) {
@@ -1178,6 +1184,7 @@ function solveConstraints(nodes, constraints) {
       rotation: [1, 0, 0, 0]
     });
   }
+  const unsupported = [];
   for (const c of constraints) {
     if (c.type === "coincident" && c.entityA && c.entityB) {
       const a = c.entityA;
@@ -1189,9 +1196,10 @@ function solveConstraints(nodes, constraints) {
         const dot = aNormal[0] * (aOrigin[0] - bOrigin[0]) + aNormal[1] * (aOrigin[1] - bOrigin[1]) + aNormal[2] * (aOrigin[2] - bOrigin[2]);
         const pos = [dot * aNormal[0], dot * aNormal[1], dot * aNormal[2]];
         transforms.set(b.node, { position: pos, rotation: [1, 0, 0, 0] });
+      } else {
+        unsupported.push(`coincident(${a.entity.type}-${b.entity.type})`);
       }
-    }
-    if (c.type === "distance" && c.entityA && c.entityB && c.value !== void 0) {
+    } else if (c.type === "distance" && c.entityA && c.entityB && c.value !== void 0) {
       const a = c.entityA;
       const b = c.entityB;
       if (a.entity.type === "plane" && b.entity.type === "plane") {
@@ -1202,10 +1210,18 @@ function solveConstraints(nodes, constraints) {
         const offset2 = currentDist + c.value;
         const pos = [offset2 * aNormal[0], offset2 * aNormal[1], offset2 * aNormal[2]];
         transforms.set(b.node, { position: pos, rotation: [1, 0, 0, 0] });
+      } else {
+        unsupported.push(`distance(${a.entity.type}-${b.entity.type})`);
       }
+    } else if (c.type === "concentric" || c.type === "angle") {
+      unsupported.push(c.type);
     }
   }
-  return { transforms, dof: 0, converged: true };
+  const dof = unsupported.reduce((sum, type) => {
+    const baseDof = UNSUPPORTED_DOF[type] ?? UNSUPPORTED_DOF[type.split("(")[0] ?? ""] ?? 0;
+    return sum + baseDof;
+  }, 0);
+  return { transforms, dof, converged: unsupported.length === 0, unsupported };
 }
 function extractEntity(mate) {
   if (mate.face) {
@@ -1218,6 +1234,22 @@ function extractEntity(mate) {
   }
   return null;
 }
+function extractPair(a, b) {
+  const entA = extractEntity(a);
+  const entB = extractEntity(b);
+  if (!entA || !entB) {
+    return errors.err(
+      errors.validationError(
+        errors.BrepErrorCode.ASSEMBLY_MATE_INVALID,
+        "solveAssembly: could not extract geometry from mate entities"
+      )
+    );
+  }
+  return errors.ok({
+    entityA: { node: a.node, entity: entA },
+    entityB: { node: b.node, entity: entB }
+  });
+}
 function addMate(assembly, constraint) {
   const existing = assembly.mates ?? [];
   return { ...assembly, mates: [...existing, constraint] };
@@ -1244,78 +1276,28 @@ function solveAssembly(assembly) {
         continue;
       }
       if (mate.type === "coincident") {
-        const entA = extractEntity(mate.entityA);
-        const entB = extractEntity(mate.entityB);
-        if (!entA || !entB) {
-          return errors.err(
-            errors.validationError(
-              errors.BrepErrorCode.ASSEMBLY_MATE_INVALID,
-              "solveAssembly: could not extract geometry from mate entities"
-            )
-          );
-        }
-        solverConstraints.push({
-          type: "coincident",
-          entityA: { node: mate.entityA.node, entity: entA },
-          entityB: { node: mate.entityB.node, entity: entB }
-        });
-      }
-      if (mate.type === "distance") {
-        const entA = extractEntity(mate.entityA);
-        const entB = extractEntity(mate.entityB);
-        if (!entA || !entB) {
-          return errors.err(
-            errors.validationError(
-              errors.BrepErrorCode.ASSEMBLY_MATE_INVALID,
-              "solveAssembly: could not extract geometry from mate entities"
-            )
-          );
-        }
-        solverConstraints.push({
-          type: "distance",
-          entityA: { node: mate.entityA.node, entity: entA },
-          entityB: { node: mate.entityB.node, entity: entB },
-          value: mate.distance
-        });
-      }
-      if (mate.type === "angle") {
-        const entA = extractEntity(mate.entityA);
-        const entB = extractEntity(mate.entityB);
-        if (!entA || !entB) {
-          return errors.err(
-            errors.validationError(
-              errors.BrepErrorCode.ASSEMBLY_MATE_INVALID,
-              "solveAssembly: could not extract geometry from mate entities"
-            )
-          );
-        }
-        solverConstraints.push({
-          type: "angle",
-          entityA: { node: mate.entityA.node, entity: entA },
-          entityB: { node: mate.entityB.node, entity: entB },
-          value: mate.angle
-        });
-      }
-      if (mate.type === "concentric") {
-        const entA = extractEntity(mate.axisA);
-        const entB = extractEntity(mate.axisB);
-        if (!entA || !entB) {
-          return errors.err(
-            errors.validationError(
-              errors.BrepErrorCode.ASSEMBLY_MATE_INVALID,
-              "solveAssembly: could not extract geometry from mate entities"
-            )
-          );
-        }
-        solverConstraints.push({
-          type: "concentric",
-          entityA: { node: mate.axisA.node, entity: entA },
-          entityB: { node: mate.axisB.node, entity: entB }
-        });
+        const pair = extractPair(mate.entityA, mate.entityB);
+        if (!pair.ok) return pair;
+        solverConstraints.push({ type: "coincident", ...pair.value });
+      } else if (mate.type === "distance") {
+        const pair = extractPair(mate.entityA, mate.entityB);
+        if (!pair.ok) return pair;
+        solverConstraints.push({ type: "distance", ...pair.value, value: mate.distance });
+      } else if (mate.type === "angle") {
+        const pair = extractPair(mate.entityA, mate.entityB);
+        if (!pair.ok) return pair;
+        solverConstraints.push({ type: "angle", ...pair.value, value: mate.angle });
+      } else {
+        const pair = extractPair(mate.axisA, mate.axisB);
+        if (!pair.ok) return pair;
+        solverConstraints.push({ type: "concentric", ...pair.value });
       }
     }
     const result2 = solveConstraints(nodes, solverConstraints);
-    if (!result2.converged) ;
+    if (!result2.converged) {
+      const detail = result2.unsupported.length > 0 ? `Unsupported constraint types: ${result2.unsupported.join(", ")} (${result2.dof} DOF unresolved)` : "Assembly constraint solver did not converge";
+      return errors.err(errors.kernelError(errors.BrepErrorCode.ASSEMBLY_NOT_CONVERGED, detail));
+    }
     return errors.ok({
       transforms: result2.transforms,
       dof: result2.dof,
@@ -2664,11 +2646,13 @@ exports.withScopeResult = shapeTypes.withScopeResult;
 exports.withScopeResultAsync = shapeTypes.withScopeResultAsync;
 exports.BrepErrorCode = errors.BrepErrorCode;
 exports.OK = errors.OK;
+exports.all = errors.all;
 exports.andThen = errors.andThen;
 exports.collect = errors.collect;
 exports.computationError = errors.computationError;
 exports.err = errors.err;
 exports.flatMap = errors.flatMap;
+exports.fromNullable = errors.fromNullable;
 exports.ioError = errors.ioError;
 exports.isErr = errors.isErr;
 exports.isOk = errors.isOk;
@@ -2678,9 +2662,13 @@ exports.mapErr = errors.mapErr;
 exports.match = errors.match;
 exports.moduleInitError = errors.moduleInitError;
 exports.ok = errors.ok;
+exports.or = errors.or;
+exports.orElse = errors.orElse;
 exports.pipeline = errors.pipeline;
 exports.queryError = errors.queryError;
 exports.sketcherStateError = errors.sketcherStateError;
+exports.tap = errors.tap;
+exports.tapErr = errors.tapErr;
 exports.tryCatch = errors.tryCatch;
 exports.tryCatchAsync = errors.tryCatchAsync;
 exports.typeCastError = errors.typeCastError;
@@ -2689,6 +2677,7 @@ exports.unwrapErr = errors.unwrapErr;
 exports.unwrapOr = errors.unwrapOr;
 exports.unwrapOrElse = errors.unwrapOrElse;
 exports.validationError = errors.validationError;
+exports.zipResults = errors.zip;
 exports.DEG2RAD = vecOps.DEG2RAD;
 exports.HASH_CODE_MAX = vecOps.HASH_CODE_MAX;
 exports.RAD2DEG = vecOps.RAD2DEG;
@@ -2725,6 +2714,7 @@ exports.createAssembly = operations.createAssembly;
 exports.createAssemblyNode = operations.createAssemblyNode;
 exports.createHistory = operations.createHistory;
 exports.createRegistry = operations.createRegistry;
+exports.deserializeHistory = operations.deserializeHistory;
 exports.exportAssemblySTEP = operations.exportAssemblySTEP;
 exports.findNode = operations.findNode;
 exports.findStep = operations.findStep;
@@ -2736,6 +2726,7 @@ exports.registerShape = operations.registerShape;
 exports.removeChild = operations.removeChild;
 exports.replayFrom = operations.replayFrom;
 exports.replayHistory = operations.replayHistory;
+exports.serializeHistory = operations.serializeHistory;
 exports.stepCount = operations.stepCount;
 exports.stepsFrom = operations.stepsFrom;
 exports.supportExtrude = operations.supportExtrude;