circuit-json-to-step 0.0.31 → 0.0.32

package/dist/index.js

@@ -828,7 +828,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"' {} \\;`,
@@ -921,6 +921,21 @@ function createVertexAt(repo, x, y, z) {
     new VertexPoint2("", repo.add(new CartesianPoint3("", 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);
@@ -939,9 +954,9 @@ function createLineEdge(repo, v1, v2) {
   const line = repo.add(new Line2("", v1.resolve(repo).pnt, vec));
   return repo.add(new EdgeCurve2("", v1, v2, line, true));
 }
-function createLineSegment(repo, start, end, z) {
-  const startVertex = createVertexAt(repo, start.x, start.y, z);
-  const endVertex = createVertexAt(repo, end.x, end.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),
@@ -949,7 +964,7 @@ function createLineSegment(repo, start, end, z) {
     end: endVertex
   };
 }
-function createArcSegment(repo, centerX, centerY, z, radius, startAngle, endAngle, rotation, centerX0, centerY0) {
+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),
@@ -965,8 +980,8 @@ function createArcSegment(repo, centerX, centerY, z, radius, startAngle, endAngl
     rotation
   );
   const center = rotatePoint(centerX, centerY, centerX0, centerY0, rotation);
-  const startVertex = createVertexAt(repo, start.x, start.y, z);
-  const endVertex = createVertexAt(repo, end.x, end.y, z);
+  const startVertex = getVertex(start.x, start.y);
+  const endVertex = getVertex(end.x, end.y);
   const centerPoint = repo.add(new CartesianPoint3("", center.x, center.y, z));
   const normalDir = repo.add(new Direction3("", 0, 0, -1));
   const refDir = repo.add(
@@ -997,6 +1012,7 @@ function createPillBoundarySegments(repo, hole, z) {
     isHorizontal
   } = geom;
   const capOffset = straightHalfLength;
+  const getVertex = createVertexCache(repo, z);
   if (isHorizontal) {
     return [
       createArcSegment(
@@ -1009,7 +1025,8 @@ function createPillBoundarySegments(repo, hole, z) {
         Math.PI / 2,
         rotation,
         centerX,
-        centerY
+        centerY,
+        getVertex
       ),
       createLineSegment(
         repo,
@@ -1027,7 +1044,7 @@ function createPillBoundarySegments(repo, hole, z) {
           centerY,
           rotation
         ),
-        z
+        getVertex
       ),
       createArcSegment(
         repo,
@@ -1039,7 +1056,8 @@ function createPillBoundarySegments(repo, hole, z) {
         3 * Math.PI / 2,
         rotation,
         centerX,
-        centerY
+        centerY,
+        getVertex
       ),
       createLineSegment(
         repo,
@@ -1057,7 +1075,7 @@ function createPillBoundarySegments(repo, hole, z) {
           centerY,
           rotation
         ),
-        z
+        getVertex
       )
     ];
   }
@@ -1072,7 +1090,8 @@ function createPillBoundarySegments(repo, hole, z) {
       0,
       rotation,
       centerX,
-      centerY
+      centerY,
+      getVertex
     ),
     createLineSegment(
       repo,
@@ -1090,7 +1109,7 @@ function createPillBoundarySegments(repo, hole, z) {
         centerY,
         rotation
       ),
-      z
+      getVertex
     ),
     createArcSegment(
       repo,
@@ -1102,7 +1121,8 @@ function createPillBoundarySegments(repo, hole, z) {
       Math.PI,
       rotation,
       centerX,
-      centerY
+      centerY,
+      getVertex
     ),
     createLineSegment(
       repo,
@@ -1120,7 +1140,7 @@ function createPillBoundarySegments(repo, hole, z) {
         centerY,
         rotation
       ),
-      z
+      getVertex
     )
   ];
 }
@@ -1141,15 +1161,20 @@ function createPillHoleGeometry(repo, hole, zMin, zMax, zDir) {
   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 = createLineEdge(
-      repo,
-      bottomSegment.start,
-      topSegment.start
-    );
-    const endVertical = createLineEdge(repo, bottomSegment.end, topSegment.end);
+    const startVertical = getVerticalEdge(bottomSegment.start, topSegment.start);
+    const endVertical = getVerticalEdge(bottomSegment.end, topSegment.end);
     const loop = repo.add(
       new EdgeLoop2("", [
         repo.add(new OrientedEdge2("", bottomSegment.edge, true)),

package/lib/pill-geometry.ts

@@ -101,6 +101,24 @@ function createVertexAt(
   )
 }
 
+function createVertexCache(repo: Repository, z: number) {
+  const vertices = new Map<string, Ref<VertexPoint>>()
+  const normalize = (value: number) => {
+    const rounded = Number(value.toFixed(9))
+    return Object.is(rounded, -0) ? 0 : rounded
+  }
+
+  return (x: number, y: number) => {
+    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: Repository,
   v1: Ref<VertexPoint>,
@@ -130,10 +148,10 @@ function createLineSegment(
   repo: Repository,
   start: { x: number; y: number },
   end: { x: number; y: number },
-  z: number,
+  getVertex: (x: number, y: number) => Ref<VertexPoint>,
 ): PillBoundarySegment {
-  const startVertex = createVertexAt(repo, start.x, start.y, z)
-  const endVertex = createVertexAt(repo, end.x, end.y, z)
+  const startVertex = getVertex(start.x, start.y)
+  const endVertex = getVertex(end.x, end.y)
   return {
     kind: "line",
     edge: createLineEdge(repo, startVertex, endVertex),
@@ -153,6 +171,7 @@ function createArcSegment(
   rotation: number,
   centerX0: number,
   centerY0: number,
+  getVertex: (x: number, y: number) => Ref<VertexPoint>,
 ): PillBoundarySegment {
   const start = rotatePoint(
     centerX + radius * Math.cos(startAngle),
@@ -169,8 +188,8 @@ function createArcSegment(
     rotation,
   )
   const center = rotatePoint(centerX, centerY, centerX0, centerY0, rotation)
-  const startVertex = createVertexAt(repo, start.x, start.y, z)
-  const endVertex = createVertexAt(repo, end.x, end.y, z)
+  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 refDir = repo.add(
@@ -207,6 +226,7 @@ function createPillBoundarySegments(
     isHorizontal,
   } = geom
   const capOffset = straightHalfLength
+  const getVertex = createVertexCache(repo, z)
 
   if (isHorizontal) {
     return [
@@ -221,6 +241,7 @@ function createPillBoundarySegments(
         rotation,
         centerX,
         centerY,
+        getVertex,
       ),
       createLineSegment(
         repo,
@@ -238,7 +259,7 @@ function createPillBoundarySegments(
           centerY,
           rotation,
         ),
-        z,
+        getVertex,
       ),
       createArcSegment(
         repo,
@@ -251,6 +272,7 @@ function createPillBoundarySegments(
         rotation,
         centerX,
         centerY,
+        getVertex,
       ),
       createLineSegment(
         repo,
@@ -268,7 +290,7 @@ function createPillBoundarySegments(
           centerY,
           rotation,
         ),
-        z,
+        getVertex,
       ),
     ]
   }
@@ -285,6 +307,7 @@ function createPillBoundarySegments(
       rotation,
       centerX,
       centerY,
+      getVertex,
     ),
     createLineSegment(
       repo,
@@ -302,7 +325,7 @@ function createPillBoundarySegments(
         centerY,
         rotation,
       ),
-      z,
+      getVertex,
     ),
     createArcSegment(
       repo,
@@ -315,6 +338,7 @@ function createPillBoundarySegments(
       rotation,
       centerX,
       centerY,
+      getVertex,
     ),
     createLineSegment(
       repo,
@@ -332,7 +356,7 @@ function createPillBoundarySegments(
         centerY,
         rotation,
       ),
-      z,
+      getVertex,
     ),
   ]
 }
@@ -365,16 +389,25 @@ export function createPillHoleGeometry(
   const bottomLoop = createLoopFromSegments(repo, bottomSegments, true)
   const topLoop = createLoopFromSegments(repo, topSegments, true)
   const wallFaces: Ref<AdvancedFace>[] = []
+  const verticalEdges = new Map<string, Ref<EdgeCurve>>()
+  const getVerticalEdge = (
+    bottomVertex: Ref<VertexPoint>,
+    topVertex: Ref<VertexPoint>,
+  ) => {
+    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 = createLineEdge(
-      repo,
-      bottomSegment.start,
-      topSegment.start,
-    )
-    const endVertical = createLineEdge(repo, bottomSegment.end, topSegment.end)
+    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)),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-step",
   "main": "dist/index.js",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "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\"' {} \\;",