@tscircuit/checks 0.0.142 → 0.0.144

package/dist/index.d.ts

@@ -78,6 +78,15 @@ declare function checkViaTraceClearance(circuitJson: AnyCircuitElement[], { conn
     minClearance?: number;
 }): PcbViaTraceClearanceError[];
 
+/**
+ * Removes generic pcb_trace_error records when a more specific pad-trace or
+ * via-trace clearance error describes the same physical pair.
+ *
+ * The specific record is retained because it includes the measured and
+ * required clearance. Trace-trace and all other generic errors are untouched.
+ */
+declare const dedupePcbDrcErrors: <T extends AnyCircuitElement>(errors: T[]) => T[];
+
 type SourcePinMustBeConnectedError = {
     type: "source_pin_must_be_connected_error";
     source_pin_must_be_connected_error_id: string;
@@ -137,4 +146,4 @@ declare function runAllChecks(circuitJson: AnyCircuitElement[]): Promise<(circui
 
 declare function checkConnectorAccessibleOrientation(circuitJson: AnyCircuitElement[]): PcbConnectorNotInAccessibleOrientationWarning[];
 
-export { NetManager, checkAllPinsInComponentAreUnderspecified, checkConnectorAccessibleOrientation, checkDifferentNetViaSpacing, checkEachPcbPortConnectedToPcbTraces, checkEachPcbTraceNonOverlapping, checkNoGroundPinDefined, checkNoPowerPinDefined, checkPadPadClearance, checkPadTraceClearance, checkPcbComponentOverlap, checkPcbComponentsOutOfBoard, checkPcbTracesOutOfBoard, checkPinMustBeConnected, checkSameNetViaSpacing, checkSourceTracesHavePcbTraces, checkSourceTracesMatchPcbTraceThickness, checkTracesAreContiguous, checkViaTraceClearance, checkViasOffBoard, runAllChecks, runAllNetlistChecks, runAllPinSpecificationChecks, runAllPlacementChecks, runAllRoutingChecks };
+export { NetManager, checkAllPinsInComponentAreUnderspecified, checkConnectorAccessibleOrientation, checkDifferentNetViaSpacing, checkEachPcbPortConnectedToPcbTraces, checkEachPcbTraceNonOverlapping, checkNoGroundPinDefined, checkNoPowerPinDefined, checkPadPadClearance, checkPadTraceClearance, checkPcbComponentOverlap, checkPcbComponentsOutOfBoard, checkPcbTracesOutOfBoard, checkPinMustBeConnected, checkSameNetViaSpacing, checkSourceTracesHavePcbTraces, checkSourceTracesMatchPcbTraceThickness, checkTracesAreContiguous, checkViaTraceClearance, checkViasOffBoard, dedupePcbDrcErrors, runAllChecks, runAllNetlistChecks, runAllPinSpecificationChecks, runAllPlacementChecks, runAllRoutingChecks };

package/dist/index.js

@@ -193,6 +193,17 @@ function isPointOnSegment(point, segment) {
   const squaredLength = (segment.end.x - segment.start.x) ** 2 + (segment.end.y - segment.start.y) ** 2;
   return dotProduct <= squaredLength + POINT_ON_SEGMENT_TOLERANCE_MM;
 }
+function isPointInPolygon(point, polygon) {
+  let inside = false;
+  for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+    const pi = polygon[i];
+    const pj = polygon[j];
+    if (isPointOnSegment(point, { start: pi, end: pj })) return true;
+    const intersects = pi.y > point.y !== pj.y > point.y && point.x < (pj.x - pi.x) * (point.y - pi.y) / (pj.y - pi.y) + pi.x;
+    if (intersects) inside = !inside;
+  }
+  return inside;
+}
 function isPointInPad(point, pad) {
   if (pad.type === "pcb_smtpad") {
     if (pad.shape === "circle") {
@@ -204,12 +215,7 @@ function isPointInPad(point, pad) {
       return Math.abs(point.x - pad.x) <= halfWidth && Math.abs(point.y - pad.y) <= halfHeight;
     }
     if (pad.shape === "rotated_rect") {
-      const dx = point.x - pad.x;
-      const dy = point.y - pad.y;
-      const angle = -pad.ccw_rotation;
-      const rotatedX = dx * Math.cos(angle) - dy * Math.sin(angle);
-      const rotatedY = dx * Math.sin(angle) + dy * Math.cos(angle);
-      return Math.abs(rotatedX) <= pad.width / 2 && Math.abs(rotatedY) <= pad.height / 2;
+      return isPointInPolygon(point, getPolygonPointsForPad(pad));
     }
     if (pad.shape === "pill" || pad.shape === "rotated_pill") {
       if (pad.shape === "rotated_pill") {
@@ -233,30 +239,19 @@ function isPointInPad(point, pad) {
       return cornerX * cornerX + cornerY * cornerY <= radius * radius;
     }
     if (pad.shape === "polygon") {
-      let inside = false;
-      for (let i = 0, j = pad.points.length - 1; i < pad.points.length; j = i++) {
-        const pi = pad.points[i];
-        const pj = pad.points[j];
-        if (isPointOnSegment(point, { start: pi, end: pj })) return true;
-        const intersects = pi.y > point.y !== pj.y > point.y && point.x < (pj.x - pi.x) * (point.y - pi.y) / (pj.y - pi.y) + pi.x;
-        if (intersects) inside = !inside;
-      }
-      return inside;
+      return isPointInPolygon(point, pad.points);
     }
   }
   if (pad.type === "pcb_plated_hole") {
     if (pad.shape === "circle") {
       return getDistanceBetweenPoints(point, pad) <= pad.outer_diameter / 2;
     }
+    if ("rect_pad_width" in pad && "rect_pad_height" in pad) {
+      return isPointInPolygon(point, getPolygonPointsForPad(pad));
+    }
     if (pad.shape === "oval" || pad.shape === "pill") {
       return Math.abs(point.x - pad.x) <= pad.outer_width / 2 && Math.abs(point.y - pad.y) <= pad.outer_height / 2;
     }
-    if (pad.shape === "circular_hole_with_rect_pad") {
-      return Math.abs(point.x - pad.x) <= pad.rect_pad_width / 2 && Math.abs(point.y - pad.y) <= pad.rect_pad_height / 2;
-    }
-    if (pad.shape === "pill_hole_with_rect_pad") {
-      return Math.abs(point.x - pad.x) <= pad.rect_pad_width / 2 && Math.abs(point.y - pad.y) <= pad.rect_pad_height / 2;
-    }
   }
   return false;
 }
@@ -1871,6 +1866,7 @@ function checkTracesAreContiguous(circuitJson) {
   );
   const padMap = /* @__PURE__ */ new Map();
   const pcbConnectivityMap = new PcbConnectivityMap(circuitJson);
+  const checkedSourceTraceIds = /* @__PURE__ */ new Set();
   for (const pad of pcbSmtPads) {
     if (pad.pcb_port_id) {
       padMap.set(pad.pcb_port_id, [...padMap.get(pad.pcb_port_id) ?? [], pad]);
@@ -1927,14 +1923,22 @@ function checkTracesAreContiguous(circuitJson) {
       circuitJson,
       trace.pcb_trace_id
     );
+    if (sourceTrace && expectedPorts.length > 0) {
+      if (checkedSourceTraceIds.has(sourceTrace.source_trace_id)) continue;
+      checkedSourceTraceIds.add(sourceTrace.source_trace_id);
+    }
     for (const port of expectedPorts) {
       if (!port.pcb_port_id) continue;
       const pads = padMap.get(port.pcb_port_id);
       if (!pads?.length) continue;
       let isConnectedByRoutedSourceTrace = false;
-      for (const candidateTrace of pcbConnectivityMap.getAllTracesConnectedToTrace(
-        trace.pcb_trace_id
-      )) {
+      const candidateTraces = [
+        ...pcbConnectivityMap.getAllTracesConnectedToTrace(trace.pcb_trace_id),
+        ...pcbTraces.filter(
+          (candidateTrace) => candidateTrace.source_trace_id === sourceTrace?.source_trace_id
+        )
+      ];
+      for (const candidateTrace of candidateTraces) {
         if (candidateTrace.pcb_trace_id === trace.pcb_trace_id) continue;
         if (!candidateTrace.source_trace_id) continue;
         const candidateSourceTrace = sourceTraces.find(
@@ -1945,16 +1949,16 @@ function checkTracesAreContiguous(circuitJson) {
         )) {
           continue;
         }
+        const candidateFirstPoint = candidateTrace.route[0];
+        const candidateLastPoint = candidateTrace.route.at(-1);
         if (getPcbPortIdsConnectedToTrace(candidateTrace).includes(
           port.pcb_port_id
-        )) {
+        ) || candidateFirstPoint?.route_type === "wire" && pads.some((pad) => isPointInPad(candidateFirstPoint, pad)) || candidateLastPoint?.route_type === "wire" && pads.some((pad) => isPointInPad(candidateLastPoint, pad))) {
           isConnectedByRoutedSourceTrace = true;
           break;
         }
       }
-      if (isConnectedByRoutedSourceTrace) {
-        continue;
-      }
+      if (isConnectedByRoutedSourceTrace) continue;
       const isFirstPointConnected = firstPoint.route_type === "wire" && pads.some(
         (pad) => isPointInPad({ x: firstPoint.x, y: firstPoint.y }, pad)
       );
@@ -2643,6 +2647,27 @@ function checkViaTraceClearance(circuitJson, {
   return Array.from(errors.values()).map(({ error }) => error);
 }
 
+// lib/dedupe-pcb-drc-errors.ts
+var dedupePcbDrcErrors = (errors) => {
+  const specificallyReportedPairIds = /* @__PURE__ */ new Set();
+  for (const error of errors) {
+    if (error.type === "pcb_pad_trace_clearance_error" && typeof error.pcb_trace_id === "string" && typeof error.pcb_pad_id === "string") {
+      specificallyReportedPairIds.add(
+        `overlap_${error.pcb_trace_id}_${error.pcb_pad_id}`
+      );
+    }
+    if (error.type === "pcb_via_trace_clearance_error" && typeof error.pcb_trace_id === "string" && typeof error.pcb_via_id === "string") {
+      specificallyReportedPairIds.add(
+        `overlap_${error.pcb_trace_id}_${error.pcb_via_id}`
+      );
+    }
+  }
+  return errors.filter((element) => {
+    const error = element;
+    return !(error.type === "pcb_trace_error" && typeof error.pcb_trace_error_id === "string" && specificallyReportedPairIds.has(error.pcb_trace_error_id));
+  });
+};
+
 // lib/check-pin-must-be-connected.ts
 function checkPinMustBeConnected(circuitJson) {
   const errors = [];
@@ -3064,7 +3089,7 @@ async function runAllPinSpecificationChecks(circuitJson) {
   ];
 }
 async function runAllRoutingChecks(circuitJson) {
-  return [
+  return dedupePcbDrcErrors([
     ...checkEachPcbPortConnectedToPcbTraces(circuitJson),
     ...checkSourceTracesHavePcbTraces(circuitJson),
     ...checkEachPcbTraceNonOverlapping(circuitJson),
@@ -3073,15 +3098,15 @@ async function runAllRoutingChecks(circuitJson) {
     ...checkDifferentNetViaSpacing(circuitJson),
     ...checkTracesAreContiguous(circuitJson),
     ...checkPcbTracesOutOfBoard(circuitJson)
-  ];
+  ]);
 }
 async function runAllChecks(circuitJson) {
-  return [
+  return dedupePcbDrcErrors([
     ...await runAllPlacementChecks(circuitJson),
     ...await runAllNetlistChecks(circuitJson),
     ...await runAllPinSpecificationChecks(circuitJson),
     ...await runAllRoutingChecks(circuitJson)
-  ];
+  ]);
 }
 export {
   NetManager,
@@ -3104,6 +3129,7 @@ export {
   checkTracesAreContiguous,
   checkViaTraceClearance,
   checkViasOffBoard,
+  dedupePcbDrcErrors,
   runAllChecks,
   runAllNetlistChecks,
   runAllPinSpecificationChecks,