cadorange 0.1.0 → 0.2.0

package/dist/{index-CBGNe8Hy.d.ts → index-DceghC4N.d.ts}

@@ -80,12 +80,16 @@ type CurveKind = "line" | "circle" | "ellipse" | "bspline" | "other";
 /**
  * Metadata for one face, normalized from the kernel's interrogation output.
  * `index` is the kernel's 1-based selection index (fillet/draft/shell targets).
+ *
+ * `center` is a reference point on the face's axis of symmetry where one
+ * exists (kernel `axisPoint` — cylinder/cone/sphere/torus), the integral
+ * centroid for planes and generic surfaces. Selection semantics key on it;
+ * occt.ts ≥0.10.0 reports both, we keep the axis-stable one.
  */
 interface FaceMeta {
   readonly index: number;
   readonly surface: SurfaceKind;
   readonly area: number;
-  /** A reference point: plane origin, cylinder/cone axis point, sphere/torus center. */
   readonly center: Vec3;
   /** Plane only — unit normal. */
   readonly normal?: Vec3;
@@ -99,7 +103,11 @@ interface EdgeMeta {
   readonly index: number;
   readonly curve: CurveKind;
   readonly length: number;
-  /** Line: midpoint. Circle/ellipse: center. Others: bounding-box midpoint. */
+  /**
+   * Line: midpoint. Circle/ellipse: the underlying circle/ellipse center
+   * (kernel `axisPoint`, not the arc's integral centroid — matches
+   * build123d selector semantics). Others: integral centroid.
+   */
   readonly center: Vec3;
   /** Line only — unit direction (start → end). */
   readonly direction?: Vec3;
@@ -146,7 +154,14 @@ interface Kernel {
   makeSphere(radius: number, at?: Vec3): ShapeHandle;
   makeCone(radius1: number, radius2: number, height: number, at?: Vec3): ShapeHandle;
   makeTorus(radius1: number, radius2: number, at?: Vec3): ShapeHandle;
-  boolean(op: "fuse" | "cut" | "common", a: ShapeHandle, b: ShapeHandle): ShapeHandle;
+  /**
+   * Booleans clean by default (UnifySameDomain — same as build123d/CadQuery):
+   * coplanar faces merge, collinear edges join. `clean: false` keeps raw
+   * fragment topology for callers that count fragments.
+   */
+  boolean(op: "fuse" | "cut" | "common", a: ShapeHandle, b: ShapeHandle, opts?: {
+    clean?: boolean;
+  }): ShapeHandle;
   /** `edgeIndices` are 1-based indices into `meta(s).edges`. Empty = all edges. */
   fillet(s: ShapeHandle, radius: number, edgeIndices: number[]): ShapeHandle;
   chamfer(s: ShapeHandle, distance: number, edgeIndices: number[]): ShapeHandle;
@@ -200,10 +215,17 @@ declare class Shape {
    * records (docs/occt-requirements.md R5). Will land with that kernel API.
    */
   vertices(): ShapeList<never>;
-  cut(b: Shape): Solid;
-  fuse(b: Shape): Solid;
+  /** See `Kernel.boolean` — cleaned by default (UnifySameDomain). */
+  cut(b: Shape, opts?: {
+    clean?: boolean;
+  }): Solid;
+  fuse(b: Shape, opts?: {
+    clean?: boolean;
+  }): Solid;
   /** build123d's `intersect` (OCCT `common`). */
-  common(b: Shape): Solid;
+  common(b: Shape, opts?: {
+    clean?: boolean;
+  }): Solid;
   /** Immediate-bake transform (occt.ts has no lazy location chain). */
   translate(by: Vec3): Solid;
   fillet(edges: ShapeList<Edge> | readonly Edge[], radius: number): Solid;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { C as Vec3, E as v, S as Plane, T as planeFrom, _ as AxisName, a as ShapeList, b as Location, c as EdgeMeta, d as Kernel, f as ShapeHandle, g as Axis3, h as Axis, i as Shape, l as FaceMeta, m as SurfaceKind, n as Edge, o as Solid, p as ShapeMeta, r as Face, s as CurveKind, t as Describe, u as HoleMeta, v as BBox, w as axisByName, x as Mesh, y as Loc } from "./index-CBGNe8Hy.js";
+import { C as Vec3, E as v, S as Plane, T as planeFrom, _ as AxisName, a as ShapeList, b as Location, c as EdgeMeta, d as Kernel, f as ShapeHandle, g as Axis3, h as Axis, i as Shape, l as FaceMeta, m as SurfaceKind, n as Edge, o as Solid, p as ShapeMeta, r as Face, s as CurveKind, t as Describe, u as HoleMeta, v as BBox, w as axisByName, x as Mesh, y as Loc } from "./index-DceghC4N.js";
 import "occt.ts";
 //#region src/io/index.d.ts
 type ExportFormat = "step" | "stl" | "glb";
@@ -20,10 +20,16 @@ interface InitOptions {
 export declare function init(opts?: InitOptions): Promise<void>;
 //#endregion
 //#region src/ops/index.d.ts
-export declare function fuse(a: Solid, b: Shape): Solid;
-export declare function cut(a: Solid, b: Shape): Solid;
+export declare function fuse(a: Solid, b: Shape, opts?: {
+  clean?: boolean;
+}): Solid;
+export declare function cut(a: Solid, b: Shape, opts?: {
+  clean?: boolean;
+}): Solid;
 /** build123d `intersect` — OCCT `common`. */
-export declare function intersect(a: Solid, b: Shape): Solid;
+export declare function intersect(a: Solid, b: Shape, opts?: {
+  clean?: boolean;
+}): Solid;
 /** Keep the OCCT name for code translated from CadQuery. */
 export declare const common: typeof intersect;
 export declare function fillet(s: Shape, edges: ShapeList<Edge> | readonly Edge[], radius: number): Solid;

package/dist/index.js

@@ -1,5 +1,5 @@
-import { a as importStep, i as exportStl, n as exportShape, r as exportStep, t as exportGlb } from "./io-N0C2K1hO.js";
-import { _ as Axis, a as Sphere, b as v, c as Face, d as Solid, g as init, i as Cylinder, l as Shape, m as record, n as Box, o as Torus, p as onOp, r as Cone, s as Edge, t as parseSelector, u as ShapeList, v as axisByName, y as planeFrom } from "./selectors-CEhRDaf2.js";
+import { a as importStep, i as exportStl, n as exportShape, r as exportStep, t as exportGlb } from "./io-DD2D1UYF.js";
+import { _ as Axis, a as Sphere, b as v, c as Face, d as Solid, g as init, i as Cylinder, l as Shape, m as record, n as Box, o as Torus, p as onOp, r as Cone, s as Edge, t as parseSelector, u as ShapeList, v as axisByName, y as planeFrom } from "./selectors-C0-da9aQ.js";
 //#region src/util.ts
 /** Thrown by every skeleton stub until the real M0 implementation lands. */
 var NotImplementedError = class extends Error {
@@ -14,15 +14,15 @@ function todo(what) {
 }
 //#endregion
 //#region src/ops/index.ts
-function fuse(a, b) {
-	return a.fuse(b);
+function fuse(a, b, opts) {
+	return a.fuse(b, opts);
 }
-function cut(a, b) {
-	return a.cut(b);
+function cut(a, b, opts) {
+	return a.cut(b, opts);
 }
 /** build123d `intersect` — OCCT `common`. */
-function intersect(a, b) {
-	return a.common(b);
+function intersect(a, b, opts) {
+	return a.common(b, opts);
 }
 /** Keep the OCCT name for code translated from CadQuery. */
 const common = intersect;

package/dist/{io-N0C2K1hO.js → io-DD2D1UYF.js}

@@ -1,4 +1,4 @@
-import { f as solidFromKernel, h as getKernel, m as record } from "./selectors-CEhRDaf2.js";
+import { f as solidFromKernel, h as getKernel, m as record } from "./selectors-C0-da9aQ.js";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {

package/dist/{selectors-CEhRDaf2.js → selectors-C0-da9aQ.js}

@@ -226,10 +226,10 @@ var OcctKernel = class {
 		const s = this.#occ.makeTorus(radius1, radius2);
 		return this.#adopt(at ? this.#occ.translate(s, at) : s);
 	}
-	boolean(op, a, b) {
+	boolean(op, a, b, opts) {
 		const ra = this.#raw(a);
 		const rb = this.#raw(b);
-		const result = op === "fuse" ? this.#occ.fuse(ra, rb) : op === "cut" ? this.#occ.cut(ra, rb) : this.#occ.common(ra, rb);
+		const result = op === "fuse" ? this.#occ.fuse(ra, rb, opts) : op === "cut" ? this.#occ.cut(ra, rb, opts) : this.#occ.common(ra, rb, opts);
 		return this.#adopt(result);
 	}
 	fillet(s, radius, edgeIndices) {
@@ -254,25 +254,18 @@ var OcctKernel = class {
 		const bbox = raw.bounds();
 		const edges = d.edges.map((e) => {
 			const curve = CURVE_KINDS.has(e.curve) ? e.curve : "other";
-			if (e.curve === "line") {
-				const center = [
-					(e.start[0] + e.end[0]) / 2,
-					(e.start[1] + e.end[1]) / 2,
-					(e.start[2] + e.end[2]) / 2
-				];
-				return {
-					index: e.index,
-					curve,
-					length: e.length,
-					center,
-					direction: e.direction
-				};
-			}
-			if (e.curve === "circle") return {
+			if (e.curve === "line") return {
 				index: e.index,
 				curve,
 				length: e.length,
 				center: e.center,
+				direction: e.direction
+			};
+			if (e.curve === "circle") return {
+				index: e.index,
+				curve,
+				length: e.length,
+				center: e.axisPoint,
 				axis: e.axis,
 				radius: e.radius
 			};
@@ -280,39 +273,25 @@ var OcctKernel = class {
 				index: e.index,
 				curve,
 				length: e.length,
-				center: e.center,
+				center: e.axisPoint,
 				axis: e.axis
 			};
-			const fallback = [
-				(bbox.min[0] + bbox.max[0]) / 2,
-				(bbox.min[1] + bbox.max[1]) / 2,
-				(bbox.min[2] + bbox.max[2]) / 2
-			];
 			return {
 				index: e.index,
 				curve,
 				length: e.length,
-				center: fallback
+				center: e.center
 			};
 		});
 		const faces = d.faces.map((f) => {
 			const surface = SURFACE_KINDS.has(f.surface) ? f.surface : "other";
-			if (f.surface === "plane") {
-				const refPoint = f.origin;
-				const onPlane = edges.filter((e) => Math.abs(v.dot(e.center, f.normal) - v.dot(refPoint, f.normal)) <= 1e-4);
-				const center = onPlane.length > 0 ? [
-					onPlane.reduce((acc, e) => acc + e.center[0], 0) / onPlane.length,
-					onPlane.reduce((acc, e) => acc + e.center[1], 0) / onPlane.length,
-					onPlane.reduce((acc, e) => acc + e.center[2], 0) / onPlane.length
-				] : refPoint;
-				return {
-					index: f.index,
-					surface,
-					area: f.area,
-					center,
-					normal: f.normal
-				};
-			}
+			if (f.surface === "plane") return {
+				index: f.index,
+				surface,
+				area: f.area,
+				center: f.center,
+				normal: f.normal
+			};
 			if (f.surface === "cylinder") return {
 				index: f.index,
 				surface,
@@ -332,27 +311,22 @@ var OcctKernel = class {
 				index: f.index,
 				surface,
 				area: f.area,
-				center: f.center,
+				center: f.axisPoint,
 				radius: f.radius
 			};
 			if (f.surface === "torus") return {
 				index: f.index,
 				surface,
 				area: f.area,
-				center: f.center,
+				center: f.axisPoint,
 				axis: f.axis,
 				radius: f.majorRadius
 			};
-			const genericCenter = [
-				(bbox.min[0] + bbox.max[0]) / 2,
-				(bbox.min[1] + bbox.max[1]) / 2,
-				(bbox.min[2] + bbox.max[2]) / 2
-			];
 			return {
 				index: f.index,
 				surface,
 				area: f.area,
-				center: genericCenter
+				center: f.center
 			};
 		});
 		const meta = {
@@ -514,24 +488,28 @@ var Shape = class {
 	vertices() {
 		throw new Error("vertices() requires kernel support (occt.ts R5: describe() vertex records) — not available yet.");
 	}
-	cut(b) {
+	/** See `Kernel.boolean` — cleaned by default (UnifySameDomain). */
+	cut(b, opts) {
 		return record("cut", {
 			target: this.handle.id,
-			tool: b.handle.id
-		}, () => solidFromKernel(getKernel().boolean("cut", this.handle, b.handle)));
+			tool: b.handle.id,
+			...opts
+		}, () => solidFromKernel(getKernel().boolean("cut", this.handle, b.handle, opts)));
 	}
-	fuse(b) {
+	fuse(b, opts) {
 		return record("fuse", {
 			target: this.handle.id,
-			tool: b.handle.id
-		}, () => solidFromKernel(getKernel().boolean("fuse", this.handle, b.handle)));
+			tool: b.handle.id,
+			...opts
+		}, () => solidFromKernel(getKernel().boolean("fuse", this.handle, b.handle, opts)));
 	}
 	/** build123d's `intersect` (OCCT `common`). */
-	common(b) {
+	common(b, opts) {
 		return record("common", {
 			target: this.handle.id,
-			tool: b.handle.id
-		}, () => solidFromKernel(getKernel().boolean("common", this.handle, b.handle)));
+			tool: b.handle.id,
+			...opts
+		}, () => solidFromKernel(getKernel().boolean("common", this.handle, b.handle, opts)));
 	}
 	/** Immediate-bake transform (occt.ts has no lazy location chain). */
 	translate(by) {
@@ -548,7 +526,7 @@ var Shape = class {
 	}
 	/** Export by file extension (.step/.stl/.glb). Node writes to disk. */
 	async export(path, opts) {
-		const { exportShape } = await import("./io-N0C2K1hO.js").then((n) => n.o);
+		const { exportShape } = await import("./io-DD2D1UYF.js").then((n) => n.o);
 		await exportShape(this, path, opts);
 	}
 	dispose() {

package/dist/workplane/index.d.ts

@@ -1,4 +1,4 @@
-import { S as Plane, o as Solid } from "../index-CBGNe8Hy.js";
+import { S as Plane, o as Solid } from "../index-DceghC4N.js";
 //#region src/workplane/index.d.ts
 export type PlaneName = "XY" | "YZ" | "XZ" | "front" | "back" | "left" | "right" | "top" | "bottom";
 export type Selector = string;

package/dist/workplane/index.js

@@ -1,4 +1,4 @@
-import { b as v, i as Cylinder, n as Box, t as parseSelector, y as planeFrom } from "../selectors-CEhRDaf2.js";
+import { b as v, i as Cylinder, n as Box, t as parseSelector, y as planeFrom } from "../selectors-C0-da9aQ.js";
 //#region src/workplane/index.ts
 /**
 * CadQuery-style fluent facade over the explicit core API.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cadorange",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Agent-native CAD runtime in TypeScript, powered by occt.ts (OCCT/WASM). Core modeling API: shapes, selectors, booleans, features, import/export.",
   "type": "module",
   "license": "Apache-2.0",
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "occt.ts": "^0.7.0"
+    "occt.ts": "^0.10.0"
   },
   "devDependencies": {
     "@types/node": "^26.6.4"