@tscircuit/cli 0.1.1380 → 0.1.1381

package/dist/cli/build/build.worker.js

@@ -13754,7 +13754,7 @@ function normalizeStepNumericExponents(stepText) {
 var package_default = {
   name: "circuit-json-to-step",
   main: "dist/index.js",
-  version: "0.0.28",
+  version: "0.0.31",
   type: "module",
   scripts: {
     "pull-reference": `git clone https://github.com/tscircuit/circuit-json.git && find circuit-json/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\; && git clone https://github.com/tscircuit/stepts.git && find stepts/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\;`,
@@ -13822,6 +13822,25 @@ function rotatePoint(x, y, centerX, centerY, angle) {
     y: centerY + dx * sin + dy * cos
   };
 }
+function createVertexAt(repo, x, y, z) {
+  return repo.add(new VertexPoint("", repo.add(new CartesianPoint("", x, y, z))));
+}
+function createVertexCache(repo, z) {
+  const vertices = /* @__PURE__ */ new Map;
+  const normalize = (value) => {
+    const rounded = Number(value.toFixed(9));
+    return Object.is(rounded, -0) ? 0 : rounded;
+  };
+  return (x, y) => {
+    const key = `${normalize(x)},${normalize(y)},${normalize(z)}`;
+    const existing = vertices.get(key);
+    if (existing)
+      return existing;
+    const vertex = createVertexAt(repo, x, y, z);
+    vertices.set(key, vertex);
+    return vertex;
+  };
+}
 function createLineEdge(repo, v1, v2) {
   const p1 = v1.resolve(repo).pnt.resolve(repo);
   const p2 = v2.resolve(repo).pnt.resolve(repo);
@@ -13840,72 +13859,38 @@ function createLineEdge(repo, v1, v2) {
   const line = repo.add(new Line("", v1.resolve(repo).pnt, vec));
   return repo.add(new EdgeCurve("", v1, v2, line, true));
 }
-function createArcEdge(repo, centerX, centerY, z, radius, startAngle, endAngle, rotation, centerX0, centerY0) {
-  const startX = centerX + radius * Math.cos(startAngle);
-  const startY = centerY + radius * Math.sin(startAngle);
-  const endX = centerX + radius * Math.cos(endAngle);
-  const endY = centerY + radius * Math.sin(endAngle);
-  const startRotated = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const endRotated = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const startVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", startRotated.x, startRotated.y, z))));
-  const endVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", endRotated.x, endRotated.y, z))));
-  const centerRotated = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
-  const centerPoint = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, z));
+function createLineSegment(repo, start, end, getVertex) {
+  const startVertex = getVertex(start.x, start.y);
+  const endVertex = getVertex(end.x, end.y);
+  return {
+    kind: "line",
+    edge: createLineEdge(repo, startVertex, endVertex),
+    start: startVertex,
+    end: endVertex
+  };
+}
+function createArcSegment(repo, centerX, centerY, z, radius, startAngle, endAngle, rotation, centerX0, centerY0, getVertex) {
+  const start = rotatePoint(centerX + radius * Math.cos(startAngle), centerY + radius * Math.sin(startAngle), centerX0, centerY0, rotation);
+  const end = rotatePoint(centerX + radius * Math.cos(endAngle), centerY + radius * Math.sin(endAngle), centerX0, centerY0, rotation);
+  const center = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
+  const startVertex = getVertex(start.x, start.y);
+  const endVertex = getVertex(end.x, end.y);
+  const centerPoint = repo.add(new CartesianPoint("", center.x, center.y, z));
   const normalDir = repo.add(new Direction("", 0, 0, -1));
-  const refAngle = rotation;
-  const refDir = repo.add(new Direction("", Math.cos(refAngle), Math.sin(refAngle), 0));
+  const refDir = repo.add(new Direction("", Math.cos(rotation), Math.sin(rotation), 0));
   const placement = repo.add(new Axis2Placement3D("", centerPoint, normalDir, refDir));
   const circle = repo.add(new Circle("", placement, radius));
-  return repo.add(new EdgeCurve("", startVertex, endVertex, circle, false));
-}
-function createPillHoleLoop(repo, hole, z, xDir) {
-  const geom = getPillGeometry(hole);
-  const {
+  return {
+    kind: "arc",
+    edge: repo.add(new EdgeCurve("", startVertex, endVertex, circle, false)),
+    start: startVertex,
+    end: endVertex,
     centerX,
     centerY,
-    radius,
-    straightHalfLength,
-    rotation,
-    isHorizontal
-  } = geom;
-  const edges = [];
-  if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    const rightArc = createArcEdge(repo, centerX + capOffset, centerY, z, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY);
-    edges.push(rightArc);
-    const bottomStart = rotatePoint(centerX + capOffset, centerY - radius, centerX, centerY, rotation);
-    const bottomEnd = rotatePoint(centerX - capOffset, centerY - radius, centerX, centerY, rotation);
-    const bottomV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, z))));
-    const bottomV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, z))));
-    edges.push(createLineEdge(repo, bottomV1, bottomV2));
-    const leftArc = createArcEdge(repo, centerX - capOffset, centerY, z, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY);
-    edges.push(leftArc);
-    const topStart = rotatePoint(centerX - capOffset, centerY + radius, centerX, centerY, rotation);
-    const topEnd = rotatePoint(centerX + capOffset, centerY + radius, centerX, centerY, rotation);
-    const topV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", topStart.x, topStart.y, z))));
-    const topV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", topEnd.x, topEnd.y, z))));
-    edges.push(createLineEdge(repo, topV1, topV2));
-  } else {
-    const capOffset = straightHalfLength;
-    const topArc = createArcEdge(repo, centerX, centerY - capOffset, z, radius, Math.PI, 0, rotation, centerX, centerY);
-    edges.push(topArc);
-    const rightStart = rotatePoint(centerX + radius, centerY - capOffset, centerX, centerY, rotation);
-    const rightEnd = rotatePoint(centerX + radius, centerY + capOffset, centerX, centerY, rotation);
-    const rightV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", rightStart.x, rightStart.y, z))));
-    const rightV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", rightEnd.x, rightEnd.y, z))));
-    edges.push(createLineEdge(repo, rightV1, rightV2));
-    const bottomArc = createArcEdge(repo, centerX, centerY + capOffset, z, radius, 0, Math.PI, rotation, centerX, centerY);
-    edges.push(bottomArc);
-    const leftStart = rotatePoint(centerX - radius, centerY + capOffset, centerX, centerY, rotation);
-    const leftEnd = rotatePoint(centerX - radius, centerY - capOffset, centerX, centerY, rotation);
-    const leftV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", leftStart.x, leftStart.y, z))));
-    const leftV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", leftEnd.x, leftEnd.y, z))));
-    edges.push(createLineEdge(repo, leftV1, leftV2));
-  }
-  const orientedEdges = edges.map((edge) => repo.add(new OrientedEdge("", edge, true)));
-  return repo.add(new EdgeLoop("", orientedEdges));
+    radius
+  };
 }
-function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
+function createPillBoundarySegments(repo, hole, z) {
   const geom = getPillGeometry(hole);
   const {
     centerX,
@@ -13915,103 +13900,75 @@ function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
     rotation,
     isHorizontal
   } = geom;
-  const faces = [];
+  const capOffset = straightHalfLength;
+  const getVertex = createVertexCache(repo, z);
   if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    faces.push(createCylindricalWall(repo, centerX + capOffset, centerY, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX - capOffset, centerY - radius, centerX + capOffset, centerY - radius, rotation, centerX, centerY, zMin, zMax, zDir));
-    faces.push(createCylindricalWall(repo, centerX - capOffset, centerY, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX + capOffset, centerY + radius, centerX - capOffset, centerY + radius, rotation, centerX, centerY, zMin, zMax, zDir));
-  } else {
-    const capOffset = straightHalfLength;
-    faces.push(createCylindricalWall(repo, centerX, centerY - capOffset, radius, Math.PI, 0, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX + radius, centerY - capOffset, centerX + radius, centerY + capOffset, rotation, centerX, centerY, zMin, zMax, zDir));
-    faces.push(createCylindricalWall(repo, centerX, centerY + capOffset, radius, 0, Math.PI, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX - radius, centerY + capOffset, centerX - radius, centerY - capOffset, rotation, centerX, centerY, zMin, zMax, zDir));
+    return [
+      createArcSegment(repo, centerX + capOffset, centerY, z, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY, getVertex),
+      createLineSegment(repo, rotatePoint(centerX + capOffset, centerY - radius, centerX, centerY, rotation), rotatePoint(centerX - capOffset, centerY - radius, centerX, centerY, rotation), getVertex),
+      createArcSegment(repo, centerX - capOffset, centerY, z, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY, getVertex),
+      createLineSegment(repo, rotatePoint(centerX - capOffset, centerY + radius, centerX, centerY, rotation), rotatePoint(centerX + capOffset, centerY + radius, centerX, centerY, rotation), getVertex)
+    ];
   }
-  return faces;
+  return [
+    createArcSegment(repo, centerX, centerY - capOffset, z, radius, Math.PI, 0, rotation, centerX, centerY, getVertex),
+    createLineSegment(repo, rotatePoint(centerX + radius, centerY - capOffset, centerX, centerY, rotation), rotatePoint(centerX + radius, centerY + capOffset, centerX, centerY, rotation), getVertex),
+    createArcSegment(repo, centerX, centerY + capOffset, z, radius, 0, Math.PI, rotation, centerX, centerY, getVertex),
+    createLineSegment(repo, rotatePoint(centerX - radius, centerY + capOffset, centerX, centerY, rotation), rotatePoint(centerX - radius, centerY - capOffset, centerX, centerY, rotation), getVertex)
+  ];
 }
-function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAngle, rotation, centerX0, centerY0, zMin, zMax, zDir, xDir) {
-  const bottomStartX = centerX + radius * Math.cos(startAngle);
-  const bottomStartY = centerY + radius * Math.sin(startAngle);
-  const bottomEndX = centerX + radius * Math.cos(endAngle);
-  const bottomEndY = centerY + radius * Math.sin(endAngle);
-  const bottomStart = rotatePoint(bottomStartX, bottomStartY, centerX0, centerY0, rotation);
-  const bottomEnd = rotatePoint(bottomEndX, bottomEndY, centerX0, centerY0, rotation);
-  const bottomStartVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin))));
-  const bottomEndVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin))));
-  const topStart = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax))));
-  const topEnd = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax))));
-  const centerRotated = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
-  const bottomCenter = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, zMin));
-  const bottomPlacement = repo.add(new Axis2Placement3D("", bottomCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-  const bottomCircle = repo.add(new Circle("", bottomPlacement, radius));
-  const bottomArc = repo.add(new EdgeCurve("", bottomStartVertex, bottomEndVertex, bottomCircle, false));
-  const topCenter = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, zMax));
-  const topPlacement = repo.add(new Axis2Placement3D("", topCenter, zDir, xDir));
-  const topCircle = repo.add(new Circle("", topPlacement, radius));
-  const topArc = repo.add(new EdgeCurve("", topEnd, topStart, topCircle, false));
-  const v1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin))));
-  const v2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax))));
-  const v3 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin))));
-  const v4 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax))));
-  const dir1 = repo.add(new Direction("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vec1 = repo.add(new Vector("", dir1, height));
-  const line1 = repo.add(new Line("", v1.resolve(repo).pnt, vec1));
-  const edge1 = repo.add(new EdgeCurve("", v1, v2, line1, true));
-  const dir2 = repo.add(new Direction("", 0, 0, 1));
-  const vec2 = repo.add(new Vector("", dir2, height));
-  const line2 = repo.add(new Line("", v3.resolve(repo).pnt, vec2));
-  const edge2 = repo.add(new EdgeCurve("", v3, v4, line2, true));
-  const loop = repo.add(new EdgeLoop("", [
-    repo.add(new OrientedEdge("", bottomArc, true)),
-    repo.add(new OrientedEdge("", edge2, true)),
-    repo.add(new OrientedEdge("", topArc, false)),
-    repo.add(new OrientedEdge("", edge1, false))
-  ]));
-  const cylinderPlacement = repo.add(new Axis2Placement3D("", bottomCenter, zDir, xDir));
-  const cylinderSurface = repo.add(new CylindricalSurface("", cylinderPlacement, radius));
-  return repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], cylinderSurface, false));
+function createLoopFromSegments(repo, segments, orientation) {
+  return repo.add(new EdgeLoop("", segments.map((segment) => repo.add(new OrientedEdge("", segment.edge, orientation)))));
 }
-function createPlanarWall(repo, startX, startY, endX, endY, rotation, centerX0, centerY0, zMin, zMax, zDir) {
-  const start = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const end = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const v1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", start.x, start.y, zMin))));
-  const v2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMin))));
-  const v3 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMax))));
-  const v4 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", start.x, start.y, zMax))));
-  const dx = end.x - start.x;
-  const dy = end.y - start.y;
-  const edgeLength = Math.sqrt(dx * dx + dy * dy);
-  const bottomDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const bottomVec = repo.add(new Vector("", bottomDir, edgeLength));
-  const bottomLine = repo.add(new Line("", v1.resolve(repo).pnt, bottomVec));
-  const bottomEdge = repo.add(new EdgeCurve("", v1, v2, bottomLine, true));
-  const topDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const topVec = repo.add(new Vector("", topDir, edgeLength));
-  const topLine = repo.add(new Line("", v4.resolve(repo).pnt, topVec));
-  const topEdge = repo.add(new EdgeCurve("", v4, v3, topLine, true));
-  const vertDir = repo.add(new Direction("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vertVec1 = repo.add(new Vector("", vertDir, height));
-  const vertLine1 = repo.add(new Line("", v2.resolve(repo).pnt, vertVec1));
-  const vertEdge1 = repo.add(new EdgeCurve("", v2, v3, vertLine1, true));
-  const vertVec2 = repo.add(new Vector("", vertDir, height));
-  const vertLine2 = repo.add(new Line("", v1.resolve(repo).pnt, vertVec2));
-  const vertEdge2 = repo.add(new EdgeCurve("", v1, v4, vertLine2, true));
-  const loop = repo.add(new EdgeLoop("", [
-    repo.add(new OrientedEdge("", bottomEdge, true)),
-    repo.add(new OrientedEdge("", vertEdge1, true)),
-    repo.add(new OrientedEdge("", topEdge, false)),
-    repo.add(new OrientedEdge("", vertEdge2, false))
-  ]));
-  const normalDir = repo.add(new Direction("", dy / edgeLength, -dx / edgeLength, 0));
-  const refDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const planeOrigin = repo.add(new CartesianPoint("", start.x, start.y, zMin));
-  const placement = repo.add(new Axis2Placement3D("", planeOrigin, normalDir, refDir));
-  const plane = repo.add(new Plane("", placement));
-  return repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], plane, true));
+function createPillHoleGeometry(repo, hole, zMin, zMax, zDir) {
+  const geom = getPillGeometry(hole);
+  const bottomSegments = createPillBoundarySegments(repo, hole, zMin);
+  const topSegments = createPillBoundarySegments(repo, hole, zMax);
+  const bottomLoop = createLoopFromSegments(repo, bottomSegments, true);
+  const topLoop = createLoopFromSegments(repo, topSegments, true);
+  const wallFaces = [];
+  const verticalEdges = /* @__PURE__ */ new Map;
+  const getVerticalEdge = (bottomVertex, topVertex) => {
+    const key = `${bottomVertex.id}:${topVertex.id}`;
+    const existing = verticalEdges.get(key);
+    if (existing)
+      return existing;
+    const edge = createLineEdge(repo, bottomVertex, topVertex);
+    verticalEdges.set(key, edge);
+    return edge;
+  };
+  for (let i = 0;i < bottomSegments.length; i++) {
+    const bottomSegment = bottomSegments[i];
+    const topSegment = topSegments[i];
+    const startVertical = getVerticalEdge(bottomSegment.start, topSegment.start);
+    const endVertical = getVerticalEdge(bottomSegment.end, topSegment.end);
+    const loop = repo.add(new EdgeLoop("", [
+      repo.add(new OrientedEdge("", bottomSegment.edge, true)),
+      repo.add(new OrientedEdge("", endVertical, true)),
+      repo.add(new OrientedEdge("", topSegment.edge, false)),
+      repo.add(new OrientedEdge("", startVertical, false))
+    ]));
+    if (bottomSegment.kind === "arc") {
+      const center = rotatePoint(bottomSegment.centerX, bottomSegment.centerY, geom.centerX, geom.centerY, geom.rotation);
+      const bottomCenter = repo.add(new CartesianPoint("", center.x, center.y, zMin));
+      const refDir2 = repo.add(new Direction("", Math.cos(geom.rotation), Math.sin(geom.rotation), 0));
+      const cylinderPlacement = repo.add(new Axis2Placement3D("", bottomCenter, zDir, refDir2));
+      const cylinderSurface = repo.add(new CylindricalSurface("", cylinderPlacement, bottomSegment.radius));
+      wallFaces.push(repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], cylinderSurface, false)));
+      continue;
+    }
+    const startPoint = bottomSegment.start.resolve(repo).pnt.resolve(repo);
+    const endPoint = bottomSegment.end.resolve(repo).pnt.resolve(repo);
+    const dx = endPoint.x - startPoint.x;
+    const dy = endPoint.y - startPoint.y;
+    const edgeLength = Math.sqrt(dx * dx + dy * dy);
+    const normalDir = repo.add(new Direction("", dy / edgeLength, -dx / edgeLength, 0));
+    const refDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
+    const placement = repo.add(new Axis2Placement3D("", bottomSegment.start.resolve(repo).pnt, normalDir, refDir));
+    const plane = repo.add(new Plane("", placement));
+    wallFaces.push(repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], plane, true)));
+  }
+  return { bottomLoop, topLoop, wallFaces };
 }
 async function circuitJsonToStep(circuitJson, options = {}) {
   const repo = new Repository;
@@ -14147,50 +14104,61 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   const bottomFrame = repo.add(new Axis2Placement3D("", origin, repo.add(new Direction("", 0, 0, -1)), xDir));
   const bottomPlane = repo.add(new Plane("", bottomFrame));
   const bottomLoop = repo.add(new EdgeLoop("", bottomEdges.map((edge) => repo.add(new OrientedEdge("", edge, true)))));
-  const bottomHoleLoops = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
-      const holeVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
-      const holePlacement = repo.add(new Axis2Placement3D("", holeCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-      const holeCircle = repo.add(new Circle("", holePlacement, radius));
-      const holeEdge = repo.add(new EdgeCurve("", holeVertex, holeVertex, holeCircle, true));
-      const holeLoop = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", holeEdge, false))]));
-      bottomHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, -halfBoardThickness, xDir);
-      bottomHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
-    }
-  }
-  const bottomFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", bottomLoop, true)), ...bottomHoleLoops], bottomPlane, true));
   const topOrigin = repo.add(new CartesianPoint("", 0, 0, halfBoardThickness));
   const topFrame = repo.add(new Axis2Placement3D("", topOrigin, zDir, xDir));
   const topPlane = repo.add(new Plane("", topFrame));
   const topLoop = repo.add(new EdgeLoop("", topEdges.map((edge) => repo.add(new OrientedEdge("", edge, false)))));
-  const topHoleLoops = [];
+  function getHoleCoordinate(coordinate) {
+    if (typeof coordinate === "number")
+      return coordinate;
+    return coordinate?.value ?? 0;
+  }
+  function createCircularHoleGeometry(hole) {
+    const holeX = getHoleCoordinate(hole.x);
+    const holeY = getHoleCoordinate(hole.y);
+    const radius = (hole.hole_diameter ?? 0) / 2;
+    const bottomHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
+    const bottomHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
+    const bottomHolePlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
+    const bottomHoleCircle = repo.add(new Circle("", bottomHolePlacement, radius));
+    const bottomHoleEdge = repo.add(new EdgeCurve("", bottomHoleVertex, bottomHoleVertex, bottomHoleCircle, true));
+    const topHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
+    const topHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
+    const topHolePlacement = repo.add(new Axis2Placement3D("", topHoleCenter, zDir, xDir));
+    const topHoleCircle = repo.add(new Circle("", topHolePlacement, radius));
+    const topHoleEdge = repo.add(new EdgeCurve("", topHoleVertex, topHoleVertex, topHoleCircle, true));
+    const bottomLoop2 = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", bottomHoleEdge, false))]));
+    const topLoop2 = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", topHoleEdge, true))]));
+    const wallLoop = repo.add(new EdgeLoop("", [
+      repo.add(new OrientedEdge("", bottomHoleEdge, true)),
+      repo.add(new OrientedEdge("", topHoleEdge, false))
+    ]));
+    const holeCylinderPlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, zDir, xDir));
+    const holeCylinderSurface = repo.add(new CylindricalSurface("", holeCylinderPlacement, radius));
+    const wallFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", wallLoop, true))], holeCylinderSurface, false));
+    return { bottomLoop: bottomLoop2, topLoop: topLoop2, wallFaces: [wallFace] };
+  }
+  const sharedHoleGeometries = [];
   for (const hole of holes) {
     const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
-      const holeVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
-      const holePlacement = repo.add(new Axis2Placement3D("", holeCenter, zDir, xDir));
-      const holeCircle = repo.add(new Circle("", holePlacement, radius));
-      const holeEdge = repo.add(new EdgeCurve("", holeVertex, holeVertex, holeCircle, true));
-      const holeLoop = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", holeEdge, true))]));
-      topHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
+      sharedHoleGeometries.push(createCircularHoleGeometry(hole));
     } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, halfBoardThickness, xDir);
-      topHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
+      sharedHoleGeometries.push(createPillHoleGeometry(repo, hole, -halfBoardThickness, halfBoardThickness, zDir));
     }
   }
+  const bottomHoleLoops = [];
+  const topHoleLoops = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    bottomHoleLoops.push(repo.add(new FaceBound("", holeGeometry.bottomLoop, true)));
+    topHoleLoops.push(repo.add(new FaceBound("", holeGeometry.topLoop, true)));
+  }
+  const bottomFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", bottomLoop, true)), ...bottomHoleLoops], bottomPlane, true));
   const topFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", topLoop, true)), ...topHoleLoops], topPlane, true));
+  const holeCylindricalFaces = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    holeCylindricalFaces.push(...holeGeometry.wallFaces);
+  }
   const sideFaces = [];
   for (let i = 0;i < bottomEdges.length; i++) {
     const nextI = (i + 1) % bottomEdges.length;
@@ -14216,36 +14184,6 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     const sideFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", sideLoop, true))], sidePlane, true));
     sideFaces.push(sideFace);
   }
-  const holeCylindricalFaces = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const bottomHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
-      const bottomHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
-      const bottomHolePlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-      const bottomHoleCircle = repo.add(new Circle("", bottomHolePlacement, radius));
-      const bottomHoleEdge = repo.add(new EdgeCurve("", bottomHoleVertex, bottomHoleVertex, bottomHoleCircle, true));
-      const topHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
-      const topHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
-      const topHolePlacement = repo.add(new Axis2Placement3D("", topHoleCenter, zDir, xDir));
-      const topHoleCircle = repo.add(new Circle("", topHolePlacement, radius));
-      const topHoleEdge = repo.add(new EdgeCurve("", topHoleVertex, topHoleVertex, topHoleCircle, true));
-      const holeCylinderLoop = repo.add(new EdgeLoop("", [
-        repo.add(new OrientedEdge("", bottomHoleEdge, true)),
-        repo.add(new OrientedEdge("", topHoleEdge, false))
-      ]));
-      const holeCylinderPlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, zDir, xDir));
-      const holeCylinderSurface = repo.add(new CylindricalSurface("", holeCylinderPlacement, radius));
-      const holeCylinderFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", holeCylinderLoop, true))], holeCylinderSurface, false));
-      holeCylindricalFaces.push(holeCylinderFace);
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillFaces = createPillCylindricalFaces(repo, hole, -halfBoardThickness, halfBoardThickness, xDir, zDir);
-      holeCylindricalFaces.push(...pillFaces);
-    }
-  }
   const allFaces = [bottomFace, topFace, ...sideFaces, ...holeCylindricalFaces];
   const styleCache = createStyleCache();
   const boardStyledItems = createStyledItems(repo, {

package/dist/cli/main.js

@@ -100616,7 +100616,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1379";
+var version = "0.1.1380";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -100657,7 +100657,7 @@ var package_default = {
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
-    "circuit-json-to-step": "^0.0.30",
+    "circuit-json-to-step": "^0.0.32",
     "circuit-json-to-tscircuit": "^0.0.9",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     commander: "^14.0.0",
@@ -112478,7 +112478,7 @@ function normalizeStepNumericExponents(stepText) {
 var package_default2 = {
   name: "circuit-json-to-step",
   main: "dist/index.js",
-  version: "0.0.28",
+  version: "0.0.31",
   type: "module",
   scripts: {
     "pull-reference": `git clone https://github.com/tscircuit/circuit-json.git && find circuit-json/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\; && git clone https://github.com/tscircuit/stepts.git && find stepts/tests -name '*.test.ts' -exec bash -c 'mv "$0" "\${0%.test.ts}.ts"' {} \\;`,
@@ -112546,6 +112546,25 @@ function rotatePoint(x, y, centerX, centerY, angle) {
     y: centerY + dx * sin + dy * cos
   };
 }
+function createVertexAt(repo, x, y, z2) {
+  return repo.add(new VertexPoint("", repo.add(new CartesianPoint("", x, y, z2))));
+}
+function createVertexCache(repo, z2) {
+  const vertices = /* @__PURE__ */ new Map;
+  const normalize = (value) => {
+    const rounded = Number(value.toFixed(9));
+    return Object.is(rounded, -0) ? 0 : rounded;
+  };
+  return (x, y) => {
+    const key = `${normalize(x)},${normalize(y)},${normalize(z2)}`;
+    const existing = vertices.get(key);
+    if (existing)
+      return existing;
+    const vertex = createVertexAt(repo, x, y, z2);
+    vertices.set(key, vertex);
+    return vertex;
+  };
+}
 function createLineEdge(repo, v1, v2) {
   const p1 = v1.resolve(repo).pnt.resolve(repo);
   const p2 = v2.resolve(repo).pnt.resolve(repo);
@@ -112564,72 +112583,38 @@ function createLineEdge(repo, v1, v2) {
   const line = repo.add(new Line("", v1.resolve(repo).pnt, vec));
   return repo.add(new EdgeCurve("", v1, v2, line, true));
 }
-function createArcEdge(repo, centerX, centerY, z2, radius, startAngle, endAngle, rotation, centerX0, centerY0) {
-  const startX = centerX + radius * Math.cos(startAngle);
-  const startY = centerY + radius * Math.sin(startAngle);
-  const endX = centerX + radius * Math.cos(endAngle);
-  const endY = centerY + radius * Math.sin(endAngle);
-  const startRotated = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const endRotated = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const startVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", startRotated.x, startRotated.y, z2))));
-  const endVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", endRotated.x, endRotated.y, z2))));
-  const centerRotated = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
-  const centerPoint = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, z2));
+function createLineSegment(repo, start, end, getVertex) {
+  const startVertex = getVertex(start.x, start.y);
+  const endVertex = getVertex(end.x, end.y);
+  return {
+    kind: "line",
+    edge: createLineEdge(repo, startVertex, endVertex),
+    start: startVertex,
+    end: endVertex
+  };
+}
+function createArcSegment(repo, centerX, centerY, z2, radius, startAngle, endAngle, rotation, centerX0, centerY0, getVertex) {
+  const start = rotatePoint(centerX + radius * Math.cos(startAngle), centerY + radius * Math.sin(startAngle), centerX0, centerY0, rotation);
+  const end = rotatePoint(centerX + radius * Math.cos(endAngle), centerY + radius * Math.sin(endAngle), centerX0, centerY0, rotation);
+  const center = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
+  const startVertex = getVertex(start.x, start.y);
+  const endVertex = getVertex(end.x, end.y);
+  const centerPoint = repo.add(new CartesianPoint("", center.x, center.y, z2));
   const normalDir = repo.add(new Direction("", 0, 0, -1));
-  const refAngle = rotation;
-  const refDir = repo.add(new Direction("", Math.cos(refAngle), Math.sin(refAngle), 0));
+  const refDir = repo.add(new Direction("", Math.cos(rotation), Math.sin(rotation), 0));
   const placement = repo.add(new Axis2Placement3D("", centerPoint, normalDir, refDir));
   const circle = repo.add(new Circle("", placement, radius));
-  return repo.add(new EdgeCurve("", startVertex, endVertex, circle, false));
-}
-function createPillHoleLoop(repo, hole, z2, xDir) {
-  const geom = getPillGeometry(hole);
-  const {
+  return {
+    kind: "arc",
+    edge: repo.add(new EdgeCurve("", startVertex, endVertex, circle, false)),
+    start: startVertex,
+    end: endVertex,
     centerX,
     centerY,
-    radius,
-    straightHalfLength,
-    rotation,
-    isHorizontal
-  } = geom;
-  const edges = [];
-  if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    const rightArc = createArcEdge(repo, centerX + capOffset, centerY, z2, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY);
-    edges.push(rightArc);
-    const bottomStart = rotatePoint(centerX + capOffset, centerY - radius, centerX, centerY, rotation);
-    const bottomEnd = rotatePoint(centerX - capOffset, centerY - radius, centerX, centerY, rotation);
-    const bottomV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, z2))));
-    const bottomV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, z2))));
-    edges.push(createLineEdge(repo, bottomV1, bottomV2));
-    const leftArc = createArcEdge(repo, centerX - capOffset, centerY, z2, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY);
-    edges.push(leftArc);
-    const topStart = rotatePoint(centerX - capOffset, centerY + radius, centerX, centerY, rotation);
-    const topEnd = rotatePoint(centerX + capOffset, centerY + radius, centerX, centerY, rotation);
-    const topV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", topStart.x, topStart.y, z2))));
-    const topV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", topEnd.x, topEnd.y, z2))));
-    edges.push(createLineEdge(repo, topV1, topV2));
-  } else {
-    const capOffset = straightHalfLength;
-    const topArc = createArcEdge(repo, centerX, centerY - capOffset, z2, radius, Math.PI, 0, rotation, centerX, centerY);
-    edges.push(topArc);
-    const rightStart = rotatePoint(centerX + radius, centerY - capOffset, centerX, centerY, rotation);
-    const rightEnd = rotatePoint(centerX + radius, centerY + capOffset, centerX, centerY, rotation);
-    const rightV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", rightStart.x, rightStart.y, z2))));
-    const rightV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", rightEnd.x, rightEnd.y, z2))));
-    edges.push(createLineEdge(repo, rightV1, rightV2));
-    const bottomArc = createArcEdge(repo, centerX, centerY + capOffset, z2, radius, 0, Math.PI, rotation, centerX, centerY);
-    edges.push(bottomArc);
-    const leftStart = rotatePoint(centerX - radius, centerY + capOffset, centerX, centerY, rotation);
-    const leftEnd = rotatePoint(centerX - radius, centerY - capOffset, centerX, centerY, rotation);
-    const leftV1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", leftStart.x, leftStart.y, z2))));
-    const leftV2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", leftEnd.x, leftEnd.y, z2))));
-    edges.push(createLineEdge(repo, leftV1, leftV2));
-  }
-  const orientedEdges = edges.map((edge) => repo.add(new OrientedEdge("", edge, true)));
-  return repo.add(new EdgeLoop("", orientedEdges));
-}
-function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
+    radius
+  };
+}
+function createPillBoundarySegments(repo, hole, z2) {
   const geom = getPillGeometry(hole);
   const {
     centerX,
@@ -112639,103 +112624,75 @@ function createPillCylindricalFaces(repo, hole, zMin, zMax, xDir, zDir) {
     rotation,
     isHorizontal
   } = geom;
-  const faces = [];
+  const capOffset = straightHalfLength;
+  const getVertex = createVertexCache(repo, z2);
   if (isHorizontal) {
-    const capOffset = straightHalfLength;
-    faces.push(createCylindricalWall(repo, centerX + capOffset, centerY, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX - capOffset, centerY - radius, centerX + capOffset, centerY - radius, rotation, centerX, centerY, zMin, zMax, zDir));
-    faces.push(createCylindricalWall(repo, centerX - capOffset, centerY, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX + capOffset, centerY + radius, centerX - capOffset, centerY + radius, rotation, centerX, centerY, zMin, zMax, zDir));
-  } else {
-    const capOffset = straightHalfLength;
-    faces.push(createCylindricalWall(repo, centerX, centerY - capOffset, radius, Math.PI, 0, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX + radius, centerY - capOffset, centerX + radius, centerY + capOffset, rotation, centerX, centerY, zMin, zMax, zDir));
-    faces.push(createCylindricalWall(repo, centerX, centerY + capOffset, radius, 0, Math.PI, rotation, centerX, centerY, zMin, zMax, zDir, xDir));
-    faces.push(createPlanarWall(repo, centerX - radius, centerY + capOffset, centerX - radius, centerY - capOffset, rotation, centerX, centerY, zMin, zMax, zDir));
-  }
-  return faces;
-}
-function createCylindricalWall(repo, centerX, centerY, radius, startAngle, endAngle, rotation, centerX0, centerY0, zMin, zMax, zDir, xDir) {
-  const bottomStartX = centerX + radius * Math.cos(startAngle);
-  const bottomStartY = centerY + radius * Math.sin(startAngle);
-  const bottomEndX = centerX + radius * Math.cos(endAngle);
-  const bottomEndY = centerY + radius * Math.sin(endAngle);
-  const bottomStart = rotatePoint(bottomStartX, bottomStartY, centerX0, centerY0, rotation);
-  const bottomEnd = rotatePoint(bottomEndX, bottomEndY, centerX0, centerY0, rotation);
-  const bottomStartVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin))));
-  const bottomEndVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin))));
-  const topStart = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax))));
-  const topEnd = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax))));
-  const centerRotated = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
-  const bottomCenter = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, zMin));
-  const bottomPlacement = repo.add(new Axis2Placement3D("", bottomCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-  const bottomCircle = repo.add(new Circle("", bottomPlacement, radius));
-  const bottomArc = repo.add(new EdgeCurve("", bottomStartVertex, bottomEndVertex, bottomCircle, false));
-  const topCenter = repo.add(new CartesianPoint("", centerRotated.x, centerRotated.y, zMax));
-  const topPlacement = repo.add(new Axis2Placement3D("", topCenter, zDir, xDir));
-  const topCircle = repo.add(new Circle("", topPlacement, radius));
-  const topArc = repo.add(new EdgeCurve("", topEnd, topStart, topCircle, false));
-  const v1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin))));
-  const v2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax))));
-  const v3 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin))));
-  const v4 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax))));
-  const dir1 = repo.add(new Direction("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vec1 = repo.add(new Vector("", dir1, height));
-  const line1 = repo.add(new Line("", v1.resolve(repo).pnt, vec1));
-  const edge1 = repo.add(new EdgeCurve("", v1, v2, line1, true));
-  const dir2 = repo.add(new Direction("", 0, 0, 1));
-  const vec2 = repo.add(new Vector("", dir2, height));
-  const line2 = repo.add(new Line("", v3.resolve(repo).pnt, vec2));
-  const edge2 = repo.add(new EdgeCurve("", v3, v4, line2, true));
-  const loop = repo.add(new EdgeLoop("", [
-    repo.add(new OrientedEdge("", bottomArc, true)),
-    repo.add(new OrientedEdge("", edge2, true)),
-    repo.add(new OrientedEdge("", topArc, false)),
-    repo.add(new OrientedEdge("", edge1, false))
-  ]));
-  const cylinderPlacement = repo.add(new Axis2Placement3D("", bottomCenter, zDir, xDir));
-  const cylinderSurface = repo.add(new CylindricalSurface("", cylinderPlacement, radius));
-  return repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], cylinderSurface, false));
-}
-function createPlanarWall(repo, startX, startY, endX, endY, rotation, centerX0, centerY0, zMin, zMax, zDir) {
-  const start = rotatePoint(startX, startY, centerX0, centerY0, rotation);
-  const end = rotatePoint(endX, endY, centerX0, centerY0, rotation);
-  const v1 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", start.x, start.y, zMin))));
-  const v2 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMin))));
-  const v3 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMax))));
-  const v4 = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", start.x, start.y, zMax))));
-  const dx = end.x - start.x;
-  const dy = end.y - start.y;
-  const edgeLength = Math.sqrt(dx * dx + dy * dy);
-  const bottomDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const bottomVec = repo.add(new Vector("", bottomDir, edgeLength));
-  const bottomLine = repo.add(new Line("", v1.resolve(repo).pnt, bottomVec));
-  const bottomEdge = repo.add(new EdgeCurve("", v1, v2, bottomLine, true));
-  const topDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const topVec = repo.add(new Vector("", topDir, edgeLength));
-  const topLine = repo.add(new Line("", v4.resolve(repo).pnt, topVec));
-  const topEdge = repo.add(new EdgeCurve("", v4, v3, topLine, true));
-  const vertDir = repo.add(new Direction("", 0, 0, 1));
-  const height = zMax - zMin;
-  const vertVec1 = repo.add(new Vector("", vertDir, height));
-  const vertLine1 = repo.add(new Line("", v2.resolve(repo).pnt, vertVec1));
-  const vertEdge1 = repo.add(new EdgeCurve("", v2, v3, vertLine1, true));
-  const vertVec2 = repo.add(new Vector("", vertDir, height));
-  const vertLine2 = repo.add(new Line("", v1.resolve(repo).pnt, vertVec2));
-  const vertEdge2 = repo.add(new EdgeCurve("", v1, v4, vertLine2, true));
-  const loop = repo.add(new EdgeLoop("", [
-    repo.add(new OrientedEdge("", bottomEdge, true)),
-    repo.add(new OrientedEdge("", vertEdge1, true)),
-    repo.add(new OrientedEdge("", topEdge, false)),
-    repo.add(new OrientedEdge("", vertEdge2, false))
-  ]));
-  const normalDir = repo.add(new Direction("", dy / edgeLength, -dx / edgeLength, 0));
-  const refDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
-  const planeOrigin = repo.add(new CartesianPoint("", start.x, start.y, zMin));
-  const placement = repo.add(new Axis2Placement3D("", planeOrigin, normalDir, refDir));
-  const plane = repo.add(new Plane("", placement));
-  return repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], plane, true));
+    return [
+      createArcSegment(repo, centerX + capOffset, centerY, z2, radius, -Math.PI / 2, Math.PI / 2, rotation, centerX, centerY, getVertex),
+      createLineSegment(repo, rotatePoint(centerX + capOffset, centerY - radius, centerX, centerY, rotation), rotatePoint(centerX - capOffset, centerY - radius, centerX, centerY, rotation), getVertex),
+      createArcSegment(repo, centerX - capOffset, centerY, z2, radius, Math.PI / 2, 3 * Math.PI / 2, rotation, centerX, centerY, getVertex),
+      createLineSegment(repo, rotatePoint(centerX - capOffset, centerY + radius, centerX, centerY, rotation), rotatePoint(centerX + capOffset, centerY + radius, centerX, centerY, rotation), getVertex)
+    ];
+  }
+  return [
+    createArcSegment(repo, centerX, centerY - capOffset, z2, radius, Math.PI, 0, rotation, centerX, centerY, getVertex),
+    createLineSegment(repo, rotatePoint(centerX + radius, centerY - capOffset, centerX, centerY, rotation), rotatePoint(centerX + radius, centerY + capOffset, centerX, centerY, rotation), getVertex),
+    createArcSegment(repo, centerX, centerY + capOffset, z2, radius, 0, Math.PI, rotation, centerX, centerY, getVertex),
+    createLineSegment(repo, rotatePoint(centerX - radius, centerY + capOffset, centerX, centerY, rotation), rotatePoint(centerX - radius, centerY - capOffset, centerX, centerY, rotation), getVertex)
+  ];
+}
+function createLoopFromSegments(repo, segments, orientation) {
+  return repo.add(new EdgeLoop("", segments.map((segment) => repo.add(new OrientedEdge("", segment.edge, orientation)))));
+}
+function createPillHoleGeometry(repo, hole, zMin, zMax, zDir) {
+  const geom = getPillGeometry(hole);
+  const bottomSegments = createPillBoundarySegments(repo, hole, zMin);
+  const topSegments = createPillBoundarySegments(repo, hole, zMax);
+  const bottomLoop = createLoopFromSegments(repo, bottomSegments, true);
+  const topLoop = createLoopFromSegments(repo, topSegments, true);
+  const wallFaces = [];
+  const verticalEdges = /* @__PURE__ */ new Map;
+  const getVerticalEdge = (bottomVertex, topVertex) => {
+    const key = `${bottomVertex.id}:${topVertex.id}`;
+    const existing = verticalEdges.get(key);
+    if (existing)
+      return existing;
+    const edge = createLineEdge(repo, bottomVertex, topVertex);
+    verticalEdges.set(key, edge);
+    return edge;
+  };
+  for (let i = 0;i < bottomSegments.length; i++) {
+    const bottomSegment = bottomSegments[i];
+    const topSegment = topSegments[i];
+    const startVertical = getVerticalEdge(bottomSegment.start, topSegment.start);
+    const endVertical = getVerticalEdge(bottomSegment.end, topSegment.end);
+    const loop = repo.add(new EdgeLoop("", [
+      repo.add(new OrientedEdge("", bottomSegment.edge, true)),
+      repo.add(new OrientedEdge("", endVertical, true)),
+      repo.add(new OrientedEdge("", topSegment.edge, false)),
+      repo.add(new OrientedEdge("", startVertical, false))
+    ]));
+    if (bottomSegment.kind === "arc") {
+      const center = rotatePoint(bottomSegment.centerX, bottomSegment.centerY, geom.centerX, geom.centerY, geom.rotation);
+      const bottomCenter = repo.add(new CartesianPoint("", center.x, center.y, zMin));
+      const refDir2 = repo.add(new Direction("", Math.cos(geom.rotation), Math.sin(geom.rotation), 0));
+      const cylinderPlacement = repo.add(new Axis2Placement3D("", bottomCenter, zDir, refDir2));
+      const cylinderSurface = repo.add(new CylindricalSurface("", cylinderPlacement, bottomSegment.radius));
+      wallFaces.push(repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], cylinderSurface, false)));
+      continue;
+    }
+    const startPoint = bottomSegment.start.resolve(repo).pnt.resolve(repo);
+    const endPoint = bottomSegment.end.resolve(repo).pnt.resolve(repo);
+    const dx = endPoint.x - startPoint.x;
+    const dy = endPoint.y - startPoint.y;
+    const edgeLength = Math.sqrt(dx * dx + dy * dy);
+    const normalDir = repo.add(new Direction("", dy / edgeLength, -dx / edgeLength, 0));
+    const refDir = repo.add(new Direction("", dx / edgeLength, dy / edgeLength, 0));
+    const placement = repo.add(new Axis2Placement3D("", bottomSegment.start.resolve(repo).pnt, normalDir, refDir));
+    const plane = repo.add(new Plane("", placement));
+    wallFaces.push(repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", loop, true))], plane, true)));
+  }
+  return { bottomLoop, topLoop, wallFaces };
 }
 async function circuitJsonToStep(circuitJson, options = {}) {
   const repo = new Repository;
@@ -112871,50 +112828,61 @@ async function circuitJsonToStep(circuitJson, options = {}) {
   const bottomFrame = repo.add(new Axis2Placement3D("", origin, repo.add(new Direction("", 0, 0, -1)), xDir));
   const bottomPlane = repo.add(new Plane("", bottomFrame));
   const bottomLoop = repo.add(new EdgeLoop("", bottomEdges.map((edge) => repo.add(new OrientedEdge("", edge, true)))));
-  const bottomHoleLoops = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
-      const holeVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
-      const holePlacement = repo.add(new Axis2Placement3D("", holeCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-      const holeCircle = repo.add(new Circle("", holePlacement, radius));
-      const holeEdge = repo.add(new EdgeCurve("", holeVertex, holeVertex, holeCircle, true));
-      const holeLoop = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", holeEdge, false))]));
-      bottomHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, -halfBoardThickness, xDir);
-      bottomHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
-    }
-  }
-  const bottomFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", bottomLoop, true)), ...bottomHoleLoops], bottomPlane, true));
   const topOrigin = repo.add(new CartesianPoint("", 0, 0, halfBoardThickness));
   const topFrame = repo.add(new Axis2Placement3D("", topOrigin, zDir, xDir));
   const topPlane = repo.add(new Plane("", topFrame));
   const topLoop = repo.add(new EdgeLoop("", topEdges.map((edge) => repo.add(new OrientedEdge("", edge, false)))));
-  const topHoleLoops = [];
+  function getHoleCoordinate(coordinate) {
+    if (typeof coordinate === "number")
+      return coordinate;
+    return coordinate?.value ?? 0;
+  }
+  function createCircularHoleGeometry(hole) {
+    const holeX = getHoleCoordinate(hole.x);
+    const holeY = getHoleCoordinate(hole.y);
+    const radius = (hole.hole_diameter ?? 0) / 2;
+    const bottomHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
+    const bottomHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
+    const bottomHolePlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
+    const bottomHoleCircle = repo.add(new Circle("", bottomHolePlacement, radius));
+    const bottomHoleEdge = repo.add(new EdgeCurve("", bottomHoleVertex, bottomHoleVertex, bottomHoleCircle, true));
+    const topHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
+    const topHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
+    const topHolePlacement = repo.add(new Axis2Placement3D("", topHoleCenter, zDir, xDir));
+    const topHoleCircle = repo.add(new Circle("", topHolePlacement, radius));
+    const topHoleEdge = repo.add(new EdgeCurve("", topHoleVertex, topHoleVertex, topHoleCircle, true));
+    const bottomLoop2 = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", bottomHoleEdge, false))]));
+    const topLoop2 = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", topHoleEdge, true))]));
+    const wallLoop = repo.add(new EdgeLoop("", [
+      repo.add(new OrientedEdge("", bottomHoleEdge, true)),
+      repo.add(new OrientedEdge("", topHoleEdge, false))
+    ]));
+    const holeCylinderPlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, zDir, xDir));
+    const holeCylinderSurface = repo.add(new CylindricalSurface("", holeCylinderPlacement, radius));
+    const wallFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", wallLoop, true))], holeCylinderSurface, false));
+    return { bottomLoop: bottomLoop2, topLoop: topLoop2, wallFaces: [wallFace] };
+  }
+  const sharedHoleGeometries = [];
   for (const hole of holes) {
     const holeShape = hole.hole_shape ?? hole.shape;
     if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const holeCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
-      const holeVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
-      const holePlacement = repo.add(new Axis2Placement3D("", holeCenter, zDir, xDir));
-      const holeCircle = repo.add(new Circle("", holePlacement, radius));
-      const holeEdge = repo.add(new EdgeCurve("", holeVertex, holeVertex, holeCircle, true));
-      const holeLoop = repo.add(new EdgeLoop("", [repo.add(new OrientedEdge("", holeEdge, true))]));
-      topHoleLoops.push(repo.add(new FaceBound("", holeLoop, true)));
+      sharedHoleGeometries.push(createCircularHoleGeometry(hole));
     } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillLoop = createPillHoleLoop(repo, hole, halfBoardThickness, xDir);
-      topHoleLoops.push(repo.add(new FaceBound("", pillLoop, true)));
+      sharedHoleGeometries.push(createPillHoleGeometry(repo, hole, -halfBoardThickness, halfBoardThickness, zDir));
     }
   }
+  const bottomHoleLoops = [];
+  const topHoleLoops = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    bottomHoleLoops.push(repo.add(new FaceBound("", holeGeometry.bottomLoop, true)));
+    topHoleLoops.push(repo.add(new FaceBound("", holeGeometry.topLoop, true)));
+  }
+  const bottomFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", bottomLoop, true)), ...bottomHoleLoops], bottomPlane, true));
   const topFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", topLoop, true)), ...topHoleLoops], topPlane, true));
+  const holeCylindricalFaces = [];
+  for (const holeGeometry of sharedHoleGeometries) {
+    holeCylindricalFaces.push(...holeGeometry.wallFaces);
+  }
   const sideFaces = [];
   for (let i = 0;i < bottomEdges.length; i++) {
     const nextI = (i + 1) % bottomEdges.length;
@@ -112940,36 +112908,6 @@ async function circuitJsonToStep(circuitJson, options = {}) {
     const sideFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", sideLoop, true))], sidePlane, true));
     sideFaces.push(sideFace);
   }
-  const holeCylindricalFaces = [];
-  for (const hole of holes) {
-    const holeShape = hole.hole_shape ?? hole.shape;
-    if (holeShape === "circle") {
-      const holeX = typeof hole.x === "number" ? hole.x : hole.x ?? 0;
-      const holeY = typeof hole.y === "number" ? hole.y : hole.y ?? 0;
-      const radius = (hole.hole_diameter ?? 0) / 2;
-      const bottomHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, -halfBoardThickness));
-      const bottomHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, -halfBoardThickness))));
-      const bottomHolePlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, repo.add(new Direction("", 0, 0, -1)), xDir));
-      const bottomHoleCircle = repo.add(new Circle("", bottomHolePlacement, radius));
-      const bottomHoleEdge = repo.add(new EdgeCurve("", bottomHoleVertex, bottomHoleVertex, bottomHoleCircle, true));
-      const topHoleCenter = repo.add(new CartesianPoint("", holeX, holeY, halfBoardThickness));
-      const topHoleVertex = repo.add(new VertexPoint("", repo.add(new CartesianPoint("", holeX + radius, holeY, halfBoardThickness))));
-      const topHolePlacement = repo.add(new Axis2Placement3D("", topHoleCenter, zDir, xDir));
-      const topHoleCircle = repo.add(new Circle("", topHolePlacement, radius));
-      const topHoleEdge = repo.add(new EdgeCurve("", topHoleVertex, topHoleVertex, topHoleCircle, true));
-      const holeCylinderLoop = repo.add(new EdgeLoop("", [
-        repo.add(new OrientedEdge("", bottomHoleEdge, true)),
-        repo.add(new OrientedEdge("", topHoleEdge, false))
-      ]));
-      const holeCylinderPlacement = repo.add(new Axis2Placement3D("", bottomHoleCenter, zDir, xDir));
-      const holeCylinderSurface = repo.add(new CylindricalSurface("", holeCylinderPlacement, radius));
-      const holeCylinderFace = repo.add(new AdvancedFace("", [repo.add(new FaceOuterBound("", holeCylinderLoop, true))], holeCylinderSurface, false));
-      holeCylindricalFaces.push(holeCylinderFace);
-    } else if (holeShape === "rotated_pill" || holeShape === "pill") {
-      const pillFaces = createPillCylindricalFaces(repo, hole, -halfBoardThickness, halfBoardThickness, xDir, zDir);
-      holeCylindricalFaces.push(...pillFaces);
-    }
-  }
   const allFaces = [bottomFace, topFace, ...sideFaces, ...holeCylindricalFaces];
   const styleCache = createStyleCache();
   const boardStyledItems = createStyledItems(repo, {

package/dist/lib/index.js

@@ -65661,7 +65661,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1379";
+var version = "0.1.1380";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65702,7 +65702,7 @@ var package_default = {
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
-    "circuit-json-to-step": "^0.0.30",
+    "circuit-json-to-step": "^0.0.32",
     "circuit-json-to-tscircuit": "^0.0.9",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     commander: "^14.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1380",
+  "version": "0.1.1381",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -38,7 +38,7 @@
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
-    "circuit-json-to-step": "^0.0.30",
+    "circuit-json-to-step": "^0.0.32",
     "circuit-json-to-tscircuit": "^0.0.9",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     "commander": "^14.0.0",