brepjs 18.129.0 → 18.131.0

package/dist/brepjs.cjs

@@ -19,7 +19,7 @@ const require_curveFns = require("./curveFns-jmKL1KZp.cjs");
 const require_meshFns = require("./meshFns-CB7HsxzB.cjs");
 const require_arrayAccess = require("./arrayAccess-e4H9cBfh.cjs");
 const require_surfaceBuilders = require("./surfaceBuilders-DUTDN2Ay.cjs");
-const require_healingFns = require("./healingFns-DTr6cgTb.cjs");
+const require_healingFns = require("./healingFns-BqmIvfPm.cjs");
 const require_threadFns = require("./threadFns-BQIE5dO9.cjs");
 const require_blueprintSketcher = require("./blueprintSketcher-B5UqD0FO.cjs");
 const require_helpers = require("./helpers-DLZUxawd.cjs");
@@ -32,10 +32,10 @@ const require_blueprintFns = require("./blueprintFns-oatmkSjh.cjs");
 const require_importFns = require("./importFns-ncp_0vEl.cjs");
 const require_loftFns = require("./loftFns-u-yPHpJ9.cjs");
 const require_textBlueprints = require("./textBlueprints-BMvBJ79v.cjs");
+const require_refResolveFns = require("./refResolveFns-c7RWIsZy.cjs");
+const require_adjacencyFns = require("./adjacencyFns-BhdfZany.cjs");
 const require_cameraFns = require("./cameraFns-i1otOZ0V.cjs");
 const require_textMetrics = require("./textMetrics-Byfb_37y.cjs");
-const require_adjacencyFns = require("./adjacencyFns-BhdfZany.cjs");
-const require_refResolveFns = require("./refResolveFns-c7RWIsZy.cjs");
 const require_workerPool = require("./workerPool-D30NsiIW.cjs");
 //#region src/kernel/types.ts
 /** Check if the kernel supports hidden-line-removal projection. */
@@ -1794,6 +1794,44 @@ function extrude$1(profile, vector) {
 		freeParams: depsOf(profile, ve)
 	};
 }
+function hashEdgeRef(h0, ref) {
+	let h = fnvMixString(h0, ref.origin);
+	h = fnvMixString(h, ref.faceRoles[0]);
+	h = fnvMixString(h, ref.faceRoles[1]);
+	const hint = ref.hint;
+	h = fnvMixBool(h, hint.length !== void 0);
+	if (hint.length !== void 0) h = fnvMixNumber(h, hint.length);
+	h = fnvMixBool(h, hint.midpoint !== void 0);
+	if (hint.midpoint) for (const c of hint.midpoint) h = fnvMixNumber(h, c);
+	return h;
+}
+/** Fillet the edge named by a lineage ref on the evaluated target. The ref is
+*  serializable node data (the cache key stays purely structural); it
+*  resolves against the materialized target at evaluation, so an upstream
+*  parameter edit re-targets the same edge by its face roles. */
+function fillet$1(target, ref, radius) {
+	const copied = {
+		origin: ref.origin,
+		faceRoles: [ref.faceRoles[0], ref.faceRoles[1]],
+		hint: {
+			entityType: "edge",
+			length: ref.hint.length,
+			midpoint: ref.hint.midpoint ? [...ref.hint.midpoint] : void 0
+		}
+	};
+	const re = asScalarExpr(radius);
+	let h = mix(startHash("Fillet"), target);
+	h = hashEdgeRef(h, copied);
+	h = mix(h, re);
+	return {
+		kind: "Fillet",
+		target,
+		ref: copied,
+		radius: re,
+		structuralHash: h,
+		freeParams: depsOf(target, re)
+	};
+}
 /** Attach a color (hex string or RGB/RGBA tuple, canonicalized to RGBA) to
 *  the evaluated result of `target`. Metadata rides beside the geometry: the
 *  evaluator re-tags the shared target materialization with an independent
@@ -1945,7 +1983,8 @@ function outputKindOf(node) {
 		case "Extrude":
 		case "Revolve":
 		case "Loft":
-		case "Sweep": return "Solid";
+		case "Sweep":
+		case "Fillet": return "Solid";
 		case "Profile": return "Face";
 		case "Path": return "Wire";
 		case "Compound": return "Compound";
@@ -2952,6 +2991,22 @@ function evalColor(node, ctx) {
 	return require_errors.ok(require_solidBuilders.colorShape(moved, [...node.color]));
 }
 //#endregion
+//#region src/csg/evaluators/fillet.ts
+function evalFillet(node, ctx) {
+	const radius = evalScalar(node.radius, ctx.env, "Fillet.radius");
+	if (!radius.ok) return radius;
+	if (radius.value <= 0) return require_errors.err(require_errors.validationError("CSG_FILLET_RADIUS", `Fillet.radius must be positive, got ${radius.value}`));
+	const t = ctx.evalNode(node.target);
+	if (!t.ok) return t;
+	if (!require_shapeTypes.isSolid(t.value)) return require_errors.err(require_errors.validationError("CSG_FILLET_TARGET", "Fillet.target did not produce a Solid"));
+	const solid = require_validityTypes.validSolid(t.value);
+	if (!solid.ok) return require_errors.err(require_errors.validationError("CSG_FILLET_TARGET", solid.error));
+	const resolved = require_refResolveFns.resolveRefIn(node.ref, t.value);
+	if (!resolved.ok) return require_errors.err(require_errors.validationError("CSG_FILLET_REF", `Fillet.ref did not resolve: ${resolved.reason}`));
+	if (!require_shapeTypes.isEdge(resolved.entity)) return require_errors.err(require_errors.validationError("CSG_FILLET_REF", "Fillet.ref resolved to a non-edge"));
+	return require_healingFns.fillet(solid.value, [resolved.entity], radius.value);
+}
+//#endregion
 //#region src/csg/evaluate.ts
 function dispatch(node, ctx) {
 	switch (node.kind) {
@@ -2983,6 +3038,7 @@ function dispatch(node, ctx) {
 		case "Sweep": return evalSweep(node, ctx);
 		case "Profile": return evalProfile(node, ctx);
 		case "Color": return evalColor(node, ctx);
+		case "Fillet": return evalFillet(node, ctx);
 	}
 }
 function hashExprValue(h, v) {
@@ -3392,7 +3448,7 @@ function withEvaluator(options, fn) {
 var MIN_CSG_VERSION = 1;
 function toJSON(node) {
 	return {
-		csgVersion: 4,
+		csgVersion: 5,
 		root: nodeToJson(node)
 	};
 }
@@ -3622,6 +3678,20 @@ function nodeToJson(n) {
 		target: nodeToJson(n.target),
 		color: [...n.color]
 	};
+	if (n.kind === "Fillet") return {
+		kind: "Fillet",
+		target: nodeToJson(n.target),
+		ref: {
+			origin: n.ref.origin,
+			faceRoles: [...n.ref.faceRoles],
+			hint: {
+				entityType: "edge",
+				length: n.ref.hint.length,
+				midpoint: n.ref.hint.midpoint ? [...n.ref.hint.midpoint] : void 0
+			}
+		},
+		radius: exprToJson(n.radius)
+	};
 	if (n.kind === "Compound") return {
 		kind: "Compound",
 		children: n.children.map(nodeToJson)
@@ -3665,7 +3735,7 @@ function readVec2(v, where) {
 function fromJSON(envelope) {
 	if (!isObj(envelope)) return bad("input is not an object");
 	const v = envelope["csgVersion"];
-	if (typeof v !== "number" || !Number.isInteger(v) || v < MIN_CSG_VERSION || v > 4) return bad(`unsupported csgVersion ${String(v)} (expected ${MIN_CSG_VERSION}..4)`);
+	if (typeof v !== "number" || !Number.isInteger(v) || v < MIN_CSG_VERSION || v > 5) return bad(`unsupported csgVersion ${String(v)} (expected ${MIN_CSG_VERSION}..5)`);
 	const root = envelope["root"];
 	return readNode(root);
 }
@@ -3780,6 +3850,7 @@ function readNode(j) {
 		case "Sweep": return readSweep(j);
 		case "Profile": return readProfile(j);
 		case "Color": return readColor(j);
+		case "Fillet": return readFillet(j);
 		default: return bad(`unknown node kind: ${String(kind)}`);
 	}
 }
@@ -4029,6 +4100,37 @@ function readContour(j, where) {
 	}
 	return require_errors.ok(contour(start.value, segments));
 }
+function readFillet(j) {
+	const target = readNode(j["target"]);
+	if (!target.ok) return target;
+	const radius = readExpr(j["radius"]);
+	if (!radius.ok) return radius;
+	const ref = j["ref"];
+	if (!isObj(ref)) return bad("Fillet.ref: not an object");
+	const origin = ref["origin"];
+	if (!isString(origin)) return bad("Fillet.ref.origin: not a string");
+	const roles = ref["faceRoles"];
+	if (!Array.isArray(roles) || roles.length !== 2 || !roles.every(isString)) return bad("Fillet.ref.faceRoles: expected two role strings");
+	const hintRaw = ref["hint"];
+	if (!isObj(hintRaw)) return bad("Fillet.ref.hint: not an object");
+	const length = hintRaw["length"];
+	if (length !== void 0 && !isNumber$1(length)) return bad("Fillet.ref.hint.length");
+	let midpoint;
+	if (hintRaw["midpoint"] !== void 0) {
+		const m = readVec3(hintRaw["midpoint"], "Fillet.ref.hint.midpoint");
+		if (!m.ok) return m;
+		midpoint = m.value;
+	}
+	return require_errors.ok(fillet$1(target.value, {
+		origin,
+		faceRoles: [roles[0], roles[1]],
+		hint: {
+			entityType: "edge",
+			length,
+			midpoint
+		}
+	}, radius.value));
+}
 function readColor(j) {
 	const target = readNode(j["target"]);
 	if (!target.ok) return target;
@@ -4176,15 +4278,9 @@ function optimizeNode(n) {
 		case "FuseAll": return optimizeFuseAll(n.shapes, n.tolerance);
 		case "CutAll": return optimizeCutAll(n.base, n.tools, n.tolerance);
 		case "Translate": return optimizeTranslate(n.target, n.vector);
-		case "Rotate": return rotate$1(optimizeNode(n.target), foldExpr(n.angle), {
-			axis: n.axis ? foldExpr(n.axis) : void 0,
-			at: n.at ? foldExpr(n.at) : void 0
-		});
-		case "Scale": return scale$2(optimizeNode(n.target), foldExpr(n.factor), { center: n.center ? foldExpr(n.center) : void 0 });
-		case "Mirror": return mirror$1(optimizeNode(n.target), {
-			normal: n.normal ? foldExpr(n.normal) : void 0,
-			at: n.at ? foldExpr(n.at) : void 0
-		});
+		case "Rotate":
+		case "Scale":
+		case "Mirror": return optimizeTransform(n);
 		case "Compound": return compound$1(n.children.map(optimizeNode).filter((c) => c.kind !== "Empty"));
 		case "Instance": return instance$1(optimizeNode(n.source), n.placements, n.fuse);
 		case "Extrude":
@@ -4193,7 +4289,8 @@ function optimizeNode(n) {
 		case "Sweep":
 		case "Profile":
 		case "Path":
-		case "Color": return optimizeFeature(n);
+		case "Color":
+		case "Fillet": return optimizeFeature(n);
 	}
 }
 function optimizeFeature(n) {
@@ -4208,6 +4305,20 @@ function optimizeFeature(n) {
 		case "Profile": return profile(foldContour(n.outline, foldExpr), n.holes.map((hole) => foldContour(hole, foldExpr)));
 		case "Path": return path(foldExpr(n.start), n.segments.map((s) => foldSegment(s, foldExpr)));
 		case "Color": return color(optimizeNode(n.target), [...n.color]);
+		case "Fillet": return fillet$1(optimizeNode(n.target), n.ref, foldExpr(n.radius));
+	}
+}
+function optimizeTransform(n) {
+	switch (n.kind) {
+		case "Rotate": return rotate$1(optimizeNode(n.target), foldExpr(n.angle), {
+			axis: n.axis ? foldExpr(n.axis) : void 0,
+			at: n.at ? foldExpr(n.at) : void 0
+		});
+		case "Scale": return scale$2(optimizeNode(n.target), foldExpr(n.factor), { center: n.center ? foldExpr(n.center) : void 0 });
+		case "Mirror": return mirror$1(optimizeNode(n.target), {
+			normal: n.normal ? foldExpr(n.normal) : void 0,
+			at: n.at ? foldExpr(n.at) : void 0
+		});
 	}
 }
 function optimizeFuse(a, b, tol) {
@@ -4300,6 +4411,16 @@ function rebuildChildren(n, pred, repl) {
 		});
 		case "Compound": return compound$1(n.children.map((c) => walk(c, pred, repl)));
 		case "Instance": return instance$1(walk(n.source, pred, repl), n.placements, n.fuse);
+		case "Extrude":
+		case "Revolve":
+		case "Loft":
+		case "Sweep":
+		case "Color":
+		case "Fillet": return rebuildFeature(n, pred, repl);
+	}
+}
+function rebuildFeature(n, pred, repl) {
+	switch (n.kind) {
 		case "Extrude": return extrude$1(walk(n.profile, pred, repl), n.vector);
 		case "Revolve": return revolve$1(walk(n.profile, pred, repl), n.angle, {
 			axis: n.axis,
@@ -4308,6 +4429,7 @@ function rebuildChildren(n, pred, repl) {
 		case "Loft": return loft$1(n.sections.map((s) => walk(s, pred, repl)), { ruled: n.ruled });
 		case "Sweep": return sweep$2(walk(n.profile, pred, repl), walk(n.spine, pred, repl), { frenet: n.frenet });
 		case "Color": return color(walk(n.target, pred, repl), [...n.color]);
+		case "Fillet": return fillet$1(walk(n.target, pred, repl), n.ref, n.radius);
 	}
 }
 function forEachNode(root, fn) {
@@ -4337,7 +4459,8 @@ function childrenOf(n) {
 		case "Rotate":
 		case "Scale":
 		case "Mirror":
-		case "Color": return [n.target];
+		case "Color":
+		case "Fillet": return [n.target];
 		case "Compound": return n.children;
 		case "Instance": return [n.source];
 		case "Extrude":
@@ -8348,7 +8471,7 @@ var patterns_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 //#endregion
 //#region src/ns/csg.ts
 var csg_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
-	CSG_VERSION: () => 4,
+	CSG_VERSION: () => 5,
 	Evaluator: () => Evaluator,
 	add: () => add$1,
 	arbitraryClosedProfile: () => arbitraryClosedProfile,
@@ -8380,6 +8503,7 @@ var csg_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 	emptySolid: () => emptySolid,
 	emptyWire: () => emptyWire,
 	extrude: () => extrude$1,
+	fillet: () => fillet$1,
 	foldExpr: () => foldExpr,
 	forEachNode: () => forEachNode,
 	fromJSON: () => fromJSON,

package/dist/brepjs.js

@@ -17,7 +17,7 @@ import { a as curveIsPeriodic, c as curvePointAt, d as flipOrientation, f as get
 import { a as meshEdges$1, c as meshMultiLOD, d as createMeshCache, i as mesh$1, l as buildMeshCacheKey, n as exportSTEP, o as meshLODs, r as exportSTL, s as meshLODsProgressive, t as exportIGES, u as clearMeshCache } from "./meshFns-CpfeEN1b.js";
 import { n as getAtOrThrow, r as lastOrThrow, t as firstOrThrow } from "./arrayAccess-DrUGPADn.js";
 import { _ as makeThreePointArc, d as makeCircle, h as makeLine, l as makeBSplineInterpolation, n as fill, p as makeEllipseArc, r as makeFace, s as assembleWire, u as makeBezierCurve } from "./surfaceBuilders-B7WlmoVr.js";
-import { A as toBufferGeometryData, C as shellWithEvolution, D as getNurbsCurveData, E as fuseAllBisect, M as toLODGeometryData, N as toLODGeometryLevels, O as getNurbsSurfaceData, P as toLineGeometryData, S as intersectWithEvolution, T as cutAllBisect, _ as positionOnCurve, a as healFace, b as filletWithEvolution, c as isValid$1, d as draft$1, f as fillet$1, g as variableFillet, h as thicken$1, i as heal$1, j as toGroupedBufferGeometryData, k as chamferDistAngle, l as solidFromShell, m as shell$1, n as fixSelfIntersection, o as healSolid, p as offset$1, r as fixShape, s as healWire, t as autoHeal, u as chamfer$1, v as chamferWithEvolution, w as checkBoolean, x as fuseWithEvolution, y as cutWithEvolution } from "./healingFns-BptGY1Th.js";
+import { A as toBufferGeometryData, C as chamfer$1, D as shell$1, E as offset$1, M as toLODGeometryData, N as toLODGeometryLevels, O as thicken$1, P as toLineGeometryData, S as chamferDistAngle, T as fillet$2, _ as checkBoolean, a as healFace, b as getNurbsCurveData, c as isValid$1, d as chamferWithEvolution, f as cutWithEvolution, g as shellWithEvolution, h as intersectWithEvolution, i as heal$1, j as toGroupedBufferGeometryData, k as variableFillet, l as solidFromShell, m as fuseWithEvolution, n as fixSelfIntersection, o as healSolid, p as filletWithEvolution, r as fixShape, s as healWire, t as autoHeal, u as positionOnCurve, v as cutAllBisect, w as draft$1, x as getNurbsSurfaceData, y as fuseAllBisect } from "./healingFns-BrrTpxjI.js";
 import { A as setJointValue, B as walkAssembly, C as cylindricalJoint, D as planarJoint, E as mechanismDOF, F as countNodes, G as quatFromAxisAngle, H as circularPattern, I as createAssemblyNode, J as quatRotate, K as quatFromTo, L as findNode, M as sphericalJoint, N as addChild, O as prismaticJoint, P as collectShapes, R as removeChild, S as addJoint, T as jointTransform, U as gridPattern, V as exportAssemblySTEP, W as linearPattern, Y as createAssembly, _ as exportURDF, a as deserializeHistory, b as inverseKinematics, c as modifyStep, d as replayFrom, f as replayHistory, g as undoLast, h as stepsFrom, i as createRegistry, j as setJointValues, k as revoluteJoint, l as registerOperation, m as stepCount, n as addStep, o as findStep, p as serializeHistory, q as quatMultiply, r as createHistory, s as getShape, t as thread, u as registerShape, v as importURDF, w as forwardKinematics, x as jointTrajectory, y as jointsFromDH, z as updateNode } from "./threadFns-B6-3UeCZ.js";
 import { n as BaseSketcher2d, r as organiseBlueprints, t as BlueprintSketcher } from "./blueprintSketcher-yZiAeqft.js";
 import { a as createTypedFinder, i as wireFinder, n as edgeFinder, r as faceFinder, t as getSingleFace } from "./helpers-BiqV-wPK.js";
@@ -30,10 +30,10 @@ import { S as reverseCurve, _ as curve2dIsOnCurve, a as isInside2D, b as curve2d
 import { a as importSVG, c as blueprintToDXF, d as exportGltf, f as exportOBJ, i as exportSTEPConfigured, l as exportDXF, n as importSTEP, o as importSVGPathD, r as importSTL, s as exportThreeMF, t as importIGES, u as exportGlb } from "./importFns-BId6d2pt.js";
 import { a as multiSectionSweep, c as twistExtrude, i as guidedSweep, n as loftAll, o as supportExtrude, r as complexExtrude, s as sweep$1, t as loft$2 } from "./loftFns-m7LoJWE2.js";
 import { a as Sketch, b as extrudeAll, c as compoundSketchLoft, d as sketchFace, f as sketchLoft, h as sketchWires, i as Sketches, l as compoundSketchRevolve, m as sketchSweep, n as getFont, o as compoundSketchExtrude, p as sketchRevolve, r as loadFont, s as compoundSketchFace, t as textBlueprints, u as sketchExtrude, v as CompoundSketch, x as revolve$2, y as extrude$2 } from "./textBlueprints-myJW6Fzl.js";
+import { _ as createRef, a as isVertexRef, b as defaultScorer, c as resolveRefParams, d as createVertexRef, f as resolveVertexRef, g as captureHint, h as assignRoles, i as isLineageRef, l as createDerivedFaceRef, m as resolveEdgeRef, n as isEdgeRef, o as resolveLineageRef, p as createEdgeRef, r as isFaceRef, s as resolveRefIn, t as isDerivedFaceRef, u as resolveDerivedFaceRef, v as resolveRef, y as updateRoles } from "./refResolveFns-DcyIQSDi.js";
+import { a as facesOfVertex, c as verticesOfFace, i as facesOfEdge, l as wiresOfFace, n as adjacentFaces, o as sharedEdges, r as edgesOfFace, s as verticesOfEdge } from "./adjacencyFns-CwcdjOsT.js";
 import { a as makeProjectedEdges, i as projectEdges, n as cameraLookAt, r as createCamera, s as isProjectionPlane, t as cameraFromPlane } from "./cameraFns-VVI0cWLa.js";
 import { n as textMetrics, r as sketchText, t as fontMetrics } from "./textMetrics-CPFqh2a1.js";
-import { a as facesOfVertex, c as verticesOfFace, i as facesOfEdge, l as wiresOfFace, n as adjacentFaces, o as sharedEdges, r as edgesOfFace, s as verticesOfEdge } from "./adjacencyFns-CwcdjOsT.js";
-import { _ as createRef, a as isVertexRef, b as defaultScorer, c as resolveRefParams, d as createVertexRef, f as resolveVertexRef, g as captureHint, h as assignRoles, i as isLineageRef, l as createDerivedFaceRef, m as resolveEdgeRef, n as isEdgeRef, o as resolveLineageRef, p as createEdgeRef, r as isFaceRef, s as resolveRefIn, t as isDerivedFaceRef, u as resolveDerivedFaceRef, v as resolveRef, y as updateRoles } from "./refResolveFns-DcyIQSDi.js";
 import { _ as isSuccessResponse, a as createWorkerClient, c as enqueueTask, d as rejectAll, f as isBatchRequest, g as isOperationRequest, h as isInitRequest, i as registerHandler, l as isEmpty$1, m as isErrorResponse, n as createOperationRegistry, o as createTaskQueue, p as isDisposeRequest, r as createWorkerHandler, s as dequeueTask, t as createWorkerPool, u as pendingCount } from "./workerPool-XcYX2UZ0.js";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -1804,6 +1804,44 @@ function extrude$1(profile, vector) {
 		freeParams: depsOf(profile, ve)
 	};
 }
+function hashEdgeRef(h0, ref) {
+	let h = fnvMixString(h0, ref.origin);
+	h = fnvMixString(h, ref.faceRoles[0]);
+	h = fnvMixString(h, ref.faceRoles[1]);
+	const hint = ref.hint;
+	h = fnvMixBool(h, hint.length !== void 0);
+	if (hint.length !== void 0) h = fnvMixNumber(h, hint.length);
+	h = fnvMixBool(h, hint.midpoint !== void 0);
+	if (hint.midpoint) for (const c of hint.midpoint) h = fnvMixNumber(h, c);
+	return h;
+}
+/** Fillet the edge named by a lineage ref on the evaluated target. The ref is
+*  serializable node data (the cache key stays purely structural); it
+*  resolves against the materialized target at evaluation, so an upstream
+*  parameter edit re-targets the same edge by its face roles. */
+function fillet$1(target, ref, radius) {
+	const copied = {
+		origin: ref.origin,
+		faceRoles: [ref.faceRoles[0], ref.faceRoles[1]],
+		hint: {
+			entityType: "edge",
+			length: ref.hint.length,
+			midpoint: ref.hint.midpoint ? [...ref.hint.midpoint] : void 0
+		}
+	};
+	const re = asScalarExpr(radius);
+	let h = mix(startHash("Fillet"), target);
+	h = hashEdgeRef(h, copied);
+	h = mix(h, re);
+	return {
+		kind: "Fillet",
+		target,
+		ref: copied,
+		radius: re,
+		structuralHash: h,
+		freeParams: depsOf(target, re)
+	};
+}
 /** Attach a color (hex string or RGB/RGBA tuple, canonicalized to RGBA) to
 *  the evaluated result of `target`. Metadata rides beside the geometry: the
 *  evaluator re-tags the shared target materialization with an independent
@@ -1955,7 +1993,8 @@ function outputKindOf(node) {
 		case "Extrude":
 		case "Revolve":
 		case "Loft":
-		case "Sweep": return "Solid";
+		case "Sweep":
+		case "Fillet": return "Solid";
 		case "Profile": return "Face";
 		case "Path": return "Wire";
 		case "Compound": return "Compound";
@@ -2962,6 +3001,22 @@ function evalColor(node, ctx) {
 	return ok(colorShape(moved, [...node.color]));
 }
 //#endregion
+//#region src/csg/evaluators/fillet.ts
+function evalFillet(node, ctx) {
+	const radius = evalScalar(node.radius, ctx.env, "Fillet.radius");
+	if (!radius.ok) return radius;
+	if (radius.value <= 0) return err(validationError("CSG_FILLET_RADIUS", `Fillet.radius must be positive, got ${radius.value}`));
+	const t = ctx.evalNode(node.target);
+	if (!t.ok) return t;
+	if (!isSolid(t.value)) return err(validationError("CSG_FILLET_TARGET", "Fillet.target did not produce a Solid"));
+	const solid = validSolid(t.value);
+	if (!solid.ok) return err(validationError("CSG_FILLET_TARGET", solid.error));
+	const resolved = resolveRefIn(node.ref, t.value);
+	if (!resolved.ok) return err(validationError("CSG_FILLET_REF", `Fillet.ref did not resolve: ${resolved.reason}`));
+	if (!isEdge(resolved.entity)) return err(validationError("CSG_FILLET_REF", "Fillet.ref resolved to a non-edge"));
+	return fillet$2(solid.value, [resolved.entity], radius.value);
+}
+//#endregion
 //#region src/csg/evaluate.ts
 function dispatch(node, ctx) {
 	switch (node.kind) {
@@ -2993,6 +3048,7 @@ function dispatch(node, ctx) {
 		case "Sweep": return evalSweep(node, ctx);
 		case "Profile": return evalProfile(node, ctx);
 		case "Color": return evalColor(node, ctx);
+		case "Fillet": return evalFillet(node, ctx);
 	}
 }
 function hashExprValue(h, v) {
@@ -3402,7 +3458,7 @@ function withEvaluator(options, fn) {
 var MIN_CSG_VERSION = 1;
 function toJSON(node) {
 	return {
-		csgVersion: 4,
+		csgVersion: 5,
 		root: nodeToJson(node)
 	};
 }
@@ -3632,6 +3688,20 @@ function nodeToJson(n) {
 		target: nodeToJson(n.target),
 		color: [...n.color]
 	};
+	if (n.kind === "Fillet") return {
+		kind: "Fillet",
+		target: nodeToJson(n.target),
+		ref: {
+			origin: n.ref.origin,
+			faceRoles: [...n.ref.faceRoles],
+			hint: {
+				entityType: "edge",
+				length: n.ref.hint.length,
+				midpoint: n.ref.hint.midpoint ? [...n.ref.hint.midpoint] : void 0
+			}
+		},
+		radius: exprToJson(n.radius)
+	};
 	if (n.kind === "Compound") return {
 		kind: "Compound",
 		children: n.children.map(nodeToJson)
@@ -3675,7 +3745,7 @@ function readVec2(v, where) {
 function fromJSON(envelope) {
 	if (!isObj(envelope)) return bad("input is not an object");
 	const v = envelope["csgVersion"];
-	if (typeof v !== "number" || !Number.isInteger(v) || v < MIN_CSG_VERSION || v > 4) return bad(`unsupported csgVersion ${String(v)} (expected ${MIN_CSG_VERSION}..4)`);
+	if (typeof v !== "number" || !Number.isInteger(v) || v < MIN_CSG_VERSION || v > 5) return bad(`unsupported csgVersion ${String(v)} (expected ${MIN_CSG_VERSION}..5)`);
 	const root = envelope["root"];
 	return readNode(root);
 }
@@ -3790,6 +3860,7 @@ function readNode(j) {
 		case "Sweep": return readSweep(j);
 		case "Profile": return readProfile(j);
 		case "Color": return readColor(j);
+		case "Fillet": return readFillet(j);
 		default: return bad(`unknown node kind: ${String(kind)}`);
 	}
 }
@@ -4039,6 +4110,37 @@ function readContour(j, where) {
 	}
 	return ok(contour(start.value, segments));
 }
+function readFillet(j) {
+	const target = readNode(j["target"]);
+	if (!target.ok) return target;
+	const radius = readExpr(j["radius"]);
+	if (!radius.ok) return radius;
+	const ref = j["ref"];
+	if (!isObj(ref)) return bad("Fillet.ref: not an object");
+	const origin = ref["origin"];
+	if (!isString(origin)) return bad("Fillet.ref.origin: not a string");
+	const roles = ref["faceRoles"];
+	if (!Array.isArray(roles) || roles.length !== 2 || !roles.every(isString)) return bad("Fillet.ref.faceRoles: expected two role strings");
+	const hintRaw = ref["hint"];
+	if (!isObj(hintRaw)) return bad("Fillet.ref.hint: not an object");
+	const length = hintRaw["length"];
+	if (length !== void 0 && !isNumber$1(length)) return bad("Fillet.ref.hint.length");
+	let midpoint;
+	if (hintRaw["midpoint"] !== void 0) {
+		const m = readVec3(hintRaw["midpoint"], "Fillet.ref.hint.midpoint");
+		if (!m.ok) return m;
+		midpoint = m.value;
+	}
+	return ok(fillet$1(target.value, {
+		origin,
+		faceRoles: [roles[0], roles[1]],
+		hint: {
+			entityType: "edge",
+			length,
+			midpoint
+		}
+	}, radius.value));
+}
 function readColor(j) {
 	const target = readNode(j["target"]);
 	if (!target.ok) return target;
@@ -4186,15 +4288,9 @@ function optimizeNode(n) {
 		case "FuseAll": return optimizeFuseAll(n.shapes, n.tolerance);
 		case "CutAll": return optimizeCutAll(n.base, n.tools, n.tolerance);
 		case "Translate": return optimizeTranslate(n.target, n.vector);
-		case "Rotate": return rotate$1(optimizeNode(n.target), foldExpr(n.angle), {
-			axis: n.axis ? foldExpr(n.axis) : void 0,
-			at: n.at ? foldExpr(n.at) : void 0
-		});
-		case "Scale": return scale$2(optimizeNode(n.target), foldExpr(n.factor), { center: n.center ? foldExpr(n.center) : void 0 });
-		case "Mirror": return mirror$1(optimizeNode(n.target), {
-			normal: n.normal ? foldExpr(n.normal) : void 0,
-			at: n.at ? foldExpr(n.at) : void 0
-		});
+		case "Rotate":
+		case "Scale":
+		case "Mirror": return optimizeTransform(n);
 		case "Compound": return compound$1(n.children.map(optimizeNode).filter((c) => c.kind !== "Empty"));
 		case "Instance": return instance$1(optimizeNode(n.source), n.placements, n.fuse);
 		case "Extrude":
@@ -4203,7 +4299,8 @@ function optimizeNode(n) {
 		case "Sweep":
 		case "Profile":
 		case "Path":
-		case "Color": return optimizeFeature(n);
+		case "Color":
+		case "Fillet": return optimizeFeature(n);
 	}
 }
 function optimizeFeature(n) {
@@ -4218,6 +4315,20 @@ function optimizeFeature(n) {
 		case "Profile": return profile(foldContour(n.outline, foldExpr), n.holes.map((hole) => foldContour(hole, foldExpr)));
 		case "Path": return path(foldExpr(n.start), n.segments.map((s) => foldSegment(s, foldExpr)));
 		case "Color": return color(optimizeNode(n.target), [...n.color]);
+		case "Fillet": return fillet$1(optimizeNode(n.target), n.ref, foldExpr(n.radius));
+	}
+}
+function optimizeTransform(n) {
+	switch (n.kind) {
+		case "Rotate": return rotate$1(optimizeNode(n.target), foldExpr(n.angle), {
+			axis: n.axis ? foldExpr(n.axis) : void 0,
+			at: n.at ? foldExpr(n.at) : void 0
+		});
+		case "Scale": return scale$2(optimizeNode(n.target), foldExpr(n.factor), { center: n.center ? foldExpr(n.center) : void 0 });
+		case "Mirror": return mirror$1(optimizeNode(n.target), {
+			normal: n.normal ? foldExpr(n.normal) : void 0,
+			at: n.at ? foldExpr(n.at) : void 0
+		});
 	}
 }
 function optimizeFuse(a, b, tol) {
@@ -4310,6 +4421,16 @@ function rebuildChildren(n, pred, repl) {
 		});
 		case "Compound": return compound$1(n.children.map((c) => walk(c, pred, repl)));
 		case "Instance": return instance$1(walk(n.source, pred, repl), n.placements, n.fuse);
+		case "Extrude":
+		case "Revolve":
+		case "Loft":
+		case "Sweep":
+		case "Color":
+		case "Fillet": return rebuildFeature(n, pred, repl);
+	}
+}
+function rebuildFeature(n, pred, repl) {
+	switch (n.kind) {
 		case "Extrude": return extrude$1(walk(n.profile, pred, repl), n.vector);
 		case "Revolve": return revolve$1(walk(n.profile, pred, repl), n.angle, {
 			axis: n.axis,
@@ -4318,6 +4439,7 @@ function rebuildChildren(n, pred, repl) {
 		case "Loft": return loft$1(n.sections.map((s) => walk(s, pred, repl)), { ruled: n.ruled });
 		case "Sweep": return sweep$2(walk(n.profile, pred, repl), walk(n.spine, pred, repl), { frenet: n.frenet });
 		case "Color": return color(walk(n.target, pred, repl), [...n.color]);
+		case "Fillet": return fillet$1(walk(n.target, pred, repl), n.ref, n.radius);
 	}
 }
 function forEachNode(root, fn) {
@@ -4347,7 +4469,8 @@ function childrenOf(n) {
 		case "Rotate":
 		case "Scale":
 		case "Mirror":
-		case "Color": return [n.target];
+		case "Color":
+		case "Fillet": return [n.target];
 		case "Compound": return n.children;
 		case "Instance": return [n.source];
 		case "Extrude":
@@ -6934,7 +7057,7 @@ function fillet(shape, edgesOrRadius, maybeRadius) {
 		edges = void 0;
 		radius = edgesOrRadius;
 	}
-	return fillet$1(s, edges, radius);
+	return fillet$2(s, edges, radius);
 }
 function chamfer(shape, edgesOrDistance, maybeDistance) {
 	const s = resolve(shape);
@@ -8357,7 +8480,7 @@ var patterns_exports = /* @__PURE__ */ __exportAll({
 //#endregion
 //#region src/ns/csg.ts
 var csg_exports = /* @__PURE__ */ __exportAll({
-	CSG_VERSION: () => 4,
+	CSG_VERSION: () => 5,
 	Evaluator: () => Evaluator,
 	add: () => add$1,
 	arbitraryClosedProfile: () => arbitraryClosedProfile,
@@ -8389,6 +8512,7 @@ var csg_exports = /* @__PURE__ */ __exportAll({
 	emptySolid: () => emptySolid,
 	emptyWire: () => emptyWire,
 	extrude: () => extrude$1,
+	fillet: () => fillet$1,
 	foldExpr: () => foldExpr,
 	forEachNode: () => forEachNode,
 	fromJSON: () => fromJSON,

package/dist/csg/builders.d.ts

@@ -2,7 +2,8 @@ import { ScalarInput, Vec2Input, Vec3Input } from './expressions.js';
 import { Contour, Segment2D } from './segments.js';
 import { Matrix4x4 } from '../core/types.js';
 import { ColorInput } from '../topology/metadata/colorFns.js';
-import { BoxNode, SphereNode, CylinderNode, ConeNode, TorusNode, PolygonNode, CircleNode, LineNode, VertexLitNode, EmptyNode, FuseNode, CutNode, IntersectNode, FuseAllNode, CutAllNode, TranslateNode, RotateNode, ScaleNode, MirrorNode, ExtrudeNode, RevolveNode, LoftNode, SweepNode, ProfileNode, PathNode, ColorNode, CompoundNode, InstanceNode, IRNode, SolidNode, FaceNode, EdgeNode, VertexNode } from './types.js';
+import { EdgeRef } from '../topology/shapeRef/shapeRefTypes.js';
+import { BoxNode, SphereNode, CylinderNode, ConeNode, TorusNode, PolygonNode, CircleNode, LineNode, VertexLitNode, EmptyNode, FuseNode, CutNode, IntersectNode, FuseAllNode, CutAllNode, TranslateNode, RotateNode, ScaleNode, MirrorNode, ExtrudeNode, RevolveNode, LoftNode, SweepNode, ProfileNode, PathNode, ColorNode, FilletNode, CompoundNode, InstanceNode, IRNode, SolidNode, FaceNode, EdgeNode, VertexNode } from './types.js';
 export declare function box(x: ScalarInput, y: ScalarInput, z: ScalarInput): BoxNode;
 export declare function sphere(radius: ScalarInput): SphereNode;
 export declare function cylinder(radius: ScalarInput, height: ScalarInput): CylinderNode;
@@ -36,6 +37,11 @@ export interface MirrorOptions {
 }
 export declare function mirror(target: IRNode, options?: MirrorOptions): MirrorNode;
 export declare function extrude(profile: FaceNode, vector: Vec3Input): ExtrudeNode;
+/** Fillet the edge named by a lineage ref on the evaluated target. The ref is
+ *  serializable node data (the cache key stays purely structural); it
+ *  resolves against the materialized target at evaluation, so an upstream
+ *  parameter edit re-targets the same edge by its face roles. */
+export declare function fillet(target: IRNode, ref: EdgeRef, radius: ScalarInput): FilletNode;
 /** Attach a color (hex string or RGB/RGBA tuple, canonicalized to RGBA) to
  *  the evaluated result of `target`. Metadata rides beside the geometry: the
  *  evaluator re-tags the shared target materialization with an independent

package/dist/csg/evaluators/fillet.d.ts

@@ -0,0 +1,5 @@
+import { Result } from '../../core/result.js';
+import { AnyShape, Dimension } from '../../core/shapeTypes.js';
+import { FilletNode } from '../types.js';
+import { EvalContext } from './context.js';
+export declare function evalFillet(node: FilletNode, ctx: EvalContext): Result<AnyShape<Dimension>>;

package/dist/csg/index.d.ts

@@ -5,9 +5,9 @@
  * parameterize via named expression bindings; evaluate against the active
  * kernel with subtree-level cache reuse for incremental parametric edits.
  */
-export { box, sphere, cylinder, cone, torus, polygon, circle, line, vertex, emptySolid, emptyFace, emptyWire, fuse, cut, intersect, fuseAll, cutAll, translate, rotate, scale, mirror, extrude, revolve, loft, sweep, profile, path, color, compound, instance, type RevolveOptions, type LoftOptions, type SweepNodeOptions, type RotateOptions, type ScaleOptions, type MirrorOptions, } from './builders.js';
+export { box, sphere, cylinder, cone, torus, polygon, circle, line, vertex, emptySolid, emptyFace, emptyWire, fuse, cut, intersect, fuseAll, cutAll, translate, rotate, scale, mirror, extrude, revolve, loft, sweep, profile, path, color, fillet, compound, instance, type RevolveOptions, type LoftOptions, type SweepNodeOptions, type RotateOptions, type ScaleOptions, type MirrorOptions, } from './builders.js';
 export { numLit, vec3Lit, vec2Lit, param, binOp, unaryOp, component, buildVec, add, mul, asScalarExpr, asVec3Expr, asVec2Expr, type Expr, type ExprValue, type Env, type ScalarInput, type Vec3Input, type Vec2Input, type BinaryOp, type UnaryOp, } from './expressions.js';
-export type { IRNode, NodeKind, OutputKind, PrimitiveNode, BooleanNode, TransformIRNode, ExtrudeNode, RevolveNode, LoftNode, SweepNode, ProfileNode, PathNode, ColorNode, InstanceNode, SolidNode, FaceNode, EdgeNode, VertexNode, AnyNode, } from './types.js';
+export type { IRNode, NodeKind, OutputKind, PrimitiveNode, BooleanNode, TransformIRNode, ExtrudeNode, RevolveNode, LoftNode, SweepNode, ProfileNode, PathNode, ColorNode, FilletNode, InstanceNode, SolidNode, FaceNode, EdgeNode, VertexNode, AnyNode, } from './types.js';
 export { outputKindOf } from './types.js';
 export { lineTo, arcTo, bezierTo, ellipseArcTo, contour, type Contour, type Segment2D, type SegmentOptions, type EllipseArcOptions, } from './segments.js';
 export { rectangularProfile, circularProfile, iBeamProfile, asymmetricIProfile, lShapeProfile, tShapeProfile, uShapeProfile, zShapeProfile, cShapeProfile, ellipseProfile, trapeziumProfile, rectangleHollowProfile, circleHollowProfile, arbitraryClosedProfile, arbitraryProfileWithVoids, type IBeamParams, type AsymmetricIParams, type LShapeParams, type TShapeParams, type UShapeParams, type ZShapeParams, type CShapeParams, type TrapeziumParams, type RectangleHollowParams, type CircleHollowParams, } from './profiles.js';

package/dist/csg/serialize.d.ts

@@ -1,6 +1,6 @@
 import { Result } from '../core/result.js';
 import { IRNode } from './types.js';
-export declare const CSG_VERSION = 4;
+export declare const CSG_VERSION = 5;
 export interface CsgEnvelope {
     readonly csgVersion: number;
     readonly root: unknown;