@tscircuit/checks 0.0.187 → 0.0.188

package/dist/index.js

@@ -799,23 +799,6 @@ var getTraceSegments = (circuitJson) => {
     return segments;
   });
 };
-var getTraceCenter = (segment) => {
-  const routePoints = segment._pcbTrace.route.flatMap((routePoint) => {
-    if (routePoint.route_type === "through_pad") {
-      return [routePoint.start, routePoint.end];
-    }
-    return [{ x: routePoint.x, y: routePoint.y }];
-  });
-  const firstPoint = routePoints[0];
-  const lastPoint = routePoints[routePoints.length - 1];
-  if (!firstPoint || !lastPoint) {
-    return midpoint(
-      { x: segment.x1, y: segment.y1 },
-      { x: segment.x2, y: segment.y2 }
-    );
-  }
-  return midpoint(firstPoint, lastPoint);
-};
 var getCenterBetweenCopperEdges = ({
   tracePoint,
   obstaclePoint,
@@ -828,6 +811,15 @@ var getCenterBetweenCopperEdges = ({
   if (distance3 === 0) return midpoint(tracePoint, obstaclePoint);
   const unitX = dx / distance3;
   const unitY = dy / distance3;
+  if (distance3 <= traceRadius + obstacleRadius) {
+    const overlapStart = Math.max(-traceRadius, distance3 - obstacleRadius);
+    const overlapEnd = Math.min(traceRadius, distance3 + obstacleRadius);
+    const offset = (overlapStart + overlapEnd) / 2;
+    return {
+      x: tracePoint.x + unitX * offset,
+      y: tracePoint.y + unitY * offset
+    };
+  }
   const traceEdge = {
     x: tracePoint.x + unitX * traceRadius,
     y: tracePoint.y + unitY * traceRadius
@@ -887,6 +879,16 @@ var getTraceObstacleClearance = (segment, obstacle) => {
   };
 };
 var isTraceObstacleOverlap = (gap) => gap <= 0;
+var getViaPadClearanceCenter = (via, pad) => getTraceObstacleClearance(
+  {
+    x1: via.x,
+    y1: via.y,
+    x2: via.x,
+    y2: via.y,
+    thickness: via.outer_diameter
+  },
+  pad
+).center;
 
 // lib/data-structures/SpatialIndex.ts
 var SpatialObjectIndex = class {
@@ -3840,7 +3842,7 @@ function checkPadTraceClearance(circuitJson, {
       if (!getLayersOfPcbElement(pad).includes(segment.layer)) continue;
       if (connMap.areIdsConnected(segment.pcb_trace_id, padId)) continue;
       const pairId = `${padId}_${segment.pcb_trace_id}`;
-      const { gap } = getTraceObstacleClearance(segment, pad);
+      const { gap, center } = getTraceObstacleClearance(segment, pad);
       if (isTraceObstacleOverlap(gap)) {
         errors.delete(pairId);
         overlappingPairIds.add(pairId);
@@ -3857,7 +3859,7 @@ function checkPadTraceClearance(circuitJson, {
         pcb_trace_id: segment.pcb_trace_id,
         minimum_clearance: minClearance,
         actual_clearance: gap,
-        center: getTraceCenter(segment)
+        center
       };
       const current = errors.get(pairId);
       if (!current || gap < current.gap) {
@@ -3892,7 +3894,7 @@ function checkViaTraceClearance(circuitJson, {
       if (connMap.areIdsConnected(segment.pcb_trace_id, via.pcb_via_id))
         continue;
       const pairId = `${via.pcb_via_id}_${segment.pcb_trace_id}`;
-      const { gap } = getTraceObstacleClearance(segment, via);
+      const { gap, center } = getTraceObstacleClearance(segment, via);
       if (isTraceObstacleOverlap(gap)) {
         errors.delete(pairId);
         overlappingPairIds.add(pairId);
@@ -3909,7 +3911,7 @@ function checkViaTraceClearance(circuitJson, {
         pcb_trace_id: segment.pcb_trace_id,
         minimum_clearance: minClearance,
         actual_clearance: gap,
-        center: getTraceCenter(segment)
+        center
       };
       const current = errors.get(pairId);
       if (!current || gap < current.gap) {
@@ -3962,8 +3964,6 @@ function checkViaPadClearance(circuitJson, {
       if (connMap.areIdsConnected(via.pcb_via_id, padId)) continue;
       const gap = getPadToPadGap(via, pad);
       if (gap + EPSILON >= requiredClearance) continue;
-      const viaCenter = getPadCenter(via);
-      const padCenter = getPadCenter(pad);
       errors.push({
         type: "pcb_pad_pad_clearance_error",
         pcb_pad_pad_clearance_error_id: `via_pad_clearance_${via.pcb_via_id}_${padId}`,
@@ -3972,10 +3972,7 @@ function checkViaPadClearance(circuitJson, {
         pcb_pad_ids: [via.pcb_via_id, padId],
         minimum_clearance: requiredClearance,
         actual_clearance: gap,
-        center: {
-          x: (viaCenter.x + padCenter.x) / 2,
-          y: (viaCenter.y + padCenter.y) / 2
-        }
+        center: getViaPadClearanceCenter(via, pad)
       });
     }
   }