brepjs 18.130.0 → 18.132.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,64 @@ 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 copyEdgeRef(ref) {
+	return {
+		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
+		}
+	};
+}
+function fillet$1(target, ref, radius) {
+	const copied = copyEdgeRef(ref);
+	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)
+	};
+}
+/** Chamfer the edge named by a lineage ref on the evaluated target. Same
+*  contract as `fillet`: the ref is deep-copied, serializable node data. */
+function chamfer$1(target, ref, distance) {
+	const copied = copyEdgeRef(ref);
+	const de = asScalarExpr(distance);
+	let h = mix(startHash("Chamfer"), target);
+	h = hashEdgeRef(h, copied);
+	h = mix(h, de);
+	return {
+		kind: "Chamfer",
+		target,
+		ref: copied,
+		distance: de,
+		structuralHash: h,
+		freeParams: depsOf(target, de)
+	};
+}
 /** 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 +2003,9 @@ function outputKindOf(node) {
 		case "Extrude":
 		case "Revolve":
 		case "Loft":
-		case "Sweep": return "Solid";
+		case "Sweep":
+		case "Fillet":
+		case "Chamfer": return "Solid";
 		case "Profile": return "Face";
 		case "Path": return "Wire";
 		case "Compound": return "Compound";
@@ -2595,7 +2655,7 @@ function evalExtrude(node, ctx) {
 function evalRevolve(node, ctx) {
 	const a = evalScalar(node.angle, ctx.env, "Revolve.angle");
 	if (!a.ok) return a;
-	if (a.value <= 0) return require_errors.err(require_errors.validationError("CSG_REVOLVE_ANGLE", `Revolve.angle must be positive (degrees), got ${a.value}`));
+	if (!Number.isFinite(a.value) || a.value <= 0) return require_errors.err(require_errors.validationError("CSG_REVOLVE_ANGLE", `Revolve.angle must be positive (degrees), got ${a.value}`));
 	const deg = Math.min(a.value, 360);
 	const axis = node.axis ? evalVec3(node.axis, ctx.env, "Revolve.axis") : require_errors.ok([
 		0,
@@ -2952,6 +3012,38 @@ 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 (!Number.isFinite(radius.value) || 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/evaluators/chamfer.ts
+function evalChamfer(node, ctx) {
+	const distance = evalScalar(node.distance, ctx.env, "Chamfer.distance");
+	if (!distance.ok) return distance;
+	if (!Number.isFinite(distance.value) || distance.value <= 0) return require_errors.err(require_errors.validationError("CSG_CHAMFER_DISTANCE", `Chamfer.distance must be positive, got ${distance.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_CHAMFER_TARGET", "Chamfer.target did not produce a Solid"));
+	const solid = require_validityTypes.validSolid(t.value);
+	if (!solid.ok) return require_errors.err(require_errors.validationError("CSG_CHAMFER_TARGET", solid.error));
+	const resolved = require_refResolveFns.resolveRefIn(node.ref, t.value);
+	if (!resolved.ok) return require_errors.err(require_errors.validationError("CSG_CHAMFER_REF", `Chamfer.ref did not resolve: ${resolved.reason}`));
+	if (!require_shapeTypes.isEdge(resolved.entity)) return require_errors.err(require_errors.validationError("CSG_CHAMFER_REF", "Chamfer.ref resolved to a non-edge"));
+	return require_healingFns.chamfer(solid.value, [resolved.entity], distance.value);
+}
+//#endregion
 //#region src/csg/evaluate.ts
 function dispatch(node, ctx) {
 	switch (node.kind) {
@@ -2976,6 +3068,19 @@ function dispatch(node, ctx) {
 		case "Mirror": return evalMirror(node, ctx);
 		case "Compound": return evalCompound(node, ctx);
 		case "Instance": return evalInstance(node, ctx);
+		case "Extrude":
+		case "Revolve":
+		case "Loft":
+		case "Path":
+		case "Sweep":
+		case "Profile":
+		case "Color":
+		case "Fillet":
+		case "Chamfer": return dispatchFeature(node, ctx);
+	}
+}
+function dispatchFeature(node, ctx) {
+	switch (node.kind) {
 		case "Extrude": return evalExtrude(node, ctx);
 		case "Revolve": return evalRevolve(node, ctx);
 		case "Loft": return evalLoft(node, ctx);
@@ -2983,6 +3088,8 @@ 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);
+		case "Chamfer": return evalChamfer(node, ctx);
 	}
 }
 function hashExprValue(h, v) {
@@ -3392,7 +3499,7 @@ function withEvaluator(options, fn) {
 var MIN_CSG_VERSION = 1;
 function toJSON(node) {
 	return {
-		csgVersion: 4,
+		csgVersion: 6,
 		root: nodeToJson(node)
 	};
 }
@@ -3548,6 +3655,17 @@ function segmentToJson(s) {
 		};
 	}
 }
+function edgeRefToJson(ref) {
+	return {
+		origin: ref.origin,
+		faceRoles: [...ref.faceRoles],
+		hint: {
+			entityType: "edge",
+			length: ref.hint.length,
+			midpoint: ref.hint.midpoint ? [...ref.hint.midpoint] : void 0
+		}
+	};
+}
 function contourToJson(c) {
 	return {
 		start: exprToJson(c.start),
@@ -3622,6 +3740,18 @@ function nodeToJson(n) {
 		target: nodeToJson(n.target),
 		color: [...n.color]
 	};
+	if (n.kind === "Fillet") return {
+		kind: "Fillet",
+		target: nodeToJson(n.target),
+		ref: edgeRefToJson(n.ref),
+		radius: exprToJson(n.radius)
+	};
+	if (n.kind === "Chamfer") return {
+		kind: "Chamfer",
+		target: nodeToJson(n.target),
+		ref: edgeRefToJson(n.ref),
+		distance: exprToJson(n.distance)
+	};
 	if (n.kind === "Compound") return {
 		kind: "Compound",
 		children: n.children.map(nodeToJson)
@@ -3665,7 +3795,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 > 6) return bad(`unsupported csgVersion ${String(v)} (expected ${MIN_CSG_VERSION}..6)`);
 	const root = envelope["root"];
 	return readNode(root);
 }
@@ -3780,6 +3910,8 @@ function readNode(j) {
 		case "Sweep": return readSweep(j);
 		case "Profile": return readProfile(j);
 		case "Color": return readColor(j);
+		case "Fillet": return readFillet(j);
+		case "Chamfer": return readChamfer(j);
 		default: return bad(`unknown node kind: ${String(kind)}`);
 	}
 }
@@ -4029,6 +4161,50 @@ function readContour(j, where) {
 	}
 	return require_errors.ok(contour(start.value, segments));
 }
+function readEdgeRef(j, where) {
+	if (!isObj(j)) return bad(`${where}: not an object`);
+	const origin = j["origin"];
+	if (!isString(origin)) return bad(`${where}.origin: not a string`);
+	const roles = j["faceRoles"];
+	if (!Array.isArray(roles) || roles.length !== 2 || !roles.every(isString)) return bad(`${where}.faceRoles: expected two role strings`);
+	const hintRaw = j["hint"];
+	if (!isObj(hintRaw)) return bad(`${where}.hint: not an object`);
+	const length = hintRaw["length"];
+	if (length !== void 0 && !isNumber$1(length)) return bad(`${where}.hint.length`);
+	let midpoint;
+	if (hintRaw["midpoint"] !== void 0) {
+		const m = readVec3(hintRaw["midpoint"], `${where}.hint.midpoint`);
+		if (!m.ok) return m;
+		midpoint = m.value;
+	}
+	return require_errors.ok({
+		origin,
+		faceRoles: [roles[0], roles[1]],
+		hint: {
+			entityType: "edge",
+			length,
+			midpoint
+		}
+	});
+}
+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 = readEdgeRef(j["ref"], "Fillet.ref");
+	if (!ref.ok) return ref;
+	return require_errors.ok(fillet$1(target.value, ref.value, radius.value));
+}
+function readChamfer(j) {
+	const target = readNode(j["target"]);
+	if (!target.ok) return target;
+	const distance = readExpr(j["distance"]);
+	if (!distance.ok) return distance;
+	const ref = readEdgeRef(j["ref"], "Chamfer.ref");
+	if (!ref.ok) return ref;
+	return require_errors.ok(chamfer$1(target.value, ref.value, distance.value));
+}
 function readColor(j) {
 	const target = readNode(j["target"]);
 	if (!target.ok) return target;
@@ -4176,15 +4352,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 +4363,9 @@ function optimizeNode(n) {
 		case "Sweep":
 		case "Profile":
 		case "Path":
-		case "Color": return optimizeFeature(n);
+		case "Color":
+		case "Fillet":
+		case "Chamfer": return optimizeFeature(n);
 	}
 }
 function optimizeFeature(n) {
@@ -4208,6 +4380,21 @@ 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));
+		case "Chamfer": return chamfer$1(optimizeNode(n.target), n.ref, foldExpr(n.distance));
+	}
+}
+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 +4487,17 @@ 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":
+		case "Chamfer": 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 +4506,8 @@ 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);
+		case "Chamfer": return chamfer$1(walk(n.target, pred, repl), n.ref, n.distance);
 	}
 }
 function forEachNode(root, fn) {
@@ -4337,7 +4537,9 @@ function childrenOf(n) {
 		case "Rotate":
 		case "Scale":
 		case "Mirror":
-		case "Color": return [n.target];
+		case "Color":
+		case "Fillet":
+		case "Chamfer": return [n.target];
 		case "Compound": return n.children;
 		case "Instance": return [n.source];
 		case "Extrude":
@@ -8348,7 +8550,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: () => 6,
 	Evaluator: () => Evaluator,
 	add: () => add$1,
 	arbitraryClosedProfile: () => arbitraryClosedProfile,
@@ -8363,6 +8565,7 @@ var csg_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 	box: () => box$2,
 	buildVec: () => buildVec,
 	cShapeProfile: () => cShapeProfile,
+	chamfer: () => chamfer$1,
 	circle: () => circle$1,
 	circleHollowProfile: () => circleHollowProfile,
 	circularProfile: () => circularProfile,
@@ -8380,6 +8583,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,