@tscircuit/checks 0.0.131 → 0.0.133

package/dist/index.js

@@ -858,11 +858,13 @@ var getRadiusOfCircuitJsonElement = (obj) => {
 // lib/check-each-pcb-trace-non-overlapping/check-each-pcb-trace-non-overlapping.ts
 function checkEachPcbTraceNonOverlapping(circuitJson, {
   connMap,
-  minClearance = DEFAULT_TRACE_MARGIN
+  minClearance
 } = {}) {
   const errors = [];
   addStartAndEndPortIdsIfMissing(circuitJson);
   connMap ??= getFullConnectivityMapFromCircuitJson2(circuitJson);
+  const board = getPcbBoard(circuitJson);
+  minClearance ??= getBoardDrcValue(board, "min_trace_to_pad_edge_clearance") ?? DEFAULT_TRACE_MARGIN;
   const pcbTraces = cju(circuitJson).pcb_trace.list();
   const pcbTraceSegments = pcbTraces.flatMap((pcbTrace) => {
     const segments = [];
@@ -1572,11 +1574,7 @@ function checkSourceTracesMatchPcbTraceThickness(circuitJson) {
 }
 
 // lib/check-source-traces-have-pcb-traces.ts
-var getSourceTraceIdsFromPcbTrace = (pcbTraceSourceTraceId) => {
-  if (!pcbTraceSourceTraceId) return [];
-  if (!pcbTraceSourceTraceId.includes("__")) return [pcbTraceSourceTraceId];
-  return pcbTraceSourceTraceId.split("__").filter((part) => part.startsWith("source_trace_"));
-};
+import { getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson6 } from "circuit-json-to-connectivity-map";
 function checkSourceTracesHavePcbTraces(circuitJson) {
   const errors = [];
   const sourceTraces = circuitJson.filter(
@@ -1585,19 +1583,25 @@ function checkSourceTracesHavePcbTraces(circuitJson) {
   const pcbTraces = circuitJson.filter(
     (el) => el.type === "pcb_trace"
   );
+  const pcbPorts = circuitJson.filter(
+    (el) => el.type === "pcb_port"
+  );
+  const sourcePortToPcbPort = new Map(
+    pcbPorts.map((pcbPort) => [pcbPort.source_port_id, pcbPort])
+  );
+  const connectivityMap = getFullConnectivityMapFromCircuitJson6(circuitJson);
   for (const sourceTrace of sourceTraces) {
     if (!sourceTrace.connected_source_port_ids?.length) continue;
     if ((sourceTrace.connected_source_net_ids?.length ?? 0) > 0) continue;
     if (sourceTrace.connected_source_port_ids.length < 2) continue;
     const hasPcbTrace = pcbTraces.some(
-      (pcbTrace) => getSourceTraceIdsFromPcbTrace(pcbTrace.source_trace_id).includes(
-        sourceTrace.source_trace_id
+      (pcbTrace) => connectivityMap.areIdsConnected(
+        sourceTrace.source_trace_id,
+        pcbTrace.pcb_trace_id
       )
     );
     if (!hasPcbTrace) {
-      const connectedPcbPorts = circuitJson.filter(
-        (el) => el.type === "pcb_port" && sourceTrace.connected_source_port_ids.includes(el.source_port_id)
-      );
+      const connectedPcbPorts = sourceTrace.connected_source_port_ids.map((sourcePortId) => sourcePortToPcbPort.get(sourcePortId)).filter((pcbPort) => pcbPort !== void 0);
       const connectedPcbComponentIds = Array.from(
         new Set(
           connectedPcbPorts.map((port) => port.pcb_component_id).filter((id) => id !== void 0)
@@ -1703,7 +1707,7 @@ import {
   getPrimaryId as getPrimaryId2
 } from "@tscircuit/circuit-json-util";
 import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
-import { getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson6 } from "circuit-json-to-connectivity-map";
+import { getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson7 } from "circuit-json-to-connectivity-map";
 
 // lib/check-pcb-components-overlap/doPcbElementsOverlap.ts
 import { getBoundsOfPcbElements as getBoundsOfPcbElements3 } from "@tscircuit/circuit-json-util";
@@ -1739,7 +1743,7 @@ var formatOverlapElementDescription = (circuitJson, element) => {
 };
 function checkPcbComponentOverlap(circuitJson) {
   const errors = [];
-  const connMap = getFullConnectivityMapFromCircuitJson6(circuitJson);
+  const connMap = getFullConnectivityMapFromCircuitJson7(circuitJson);
   const smtPads = cju4(circuitJson).pcb_smtpad.list();
   const platedHoles = cju4(circuitJson).pcb_plated_hole.list();
   const holes = cju4(circuitJson).pcb_hole.list();
@@ -1857,7 +1861,7 @@ import {
   getReadableNameForElement as getReadableNameForElement6
 } from "@tscircuit/circuit-json-util";
 import {
-  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson7
+  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson8
 } from "circuit-json-to-connectivity-map";
 
 // lib/check-pad-clearance/common.ts
@@ -1970,7 +1974,7 @@ function checkPadPadClearance(circuitJson, {
   if (pads.length < 2) return [];
   const board = getPcbBoard(circuitJson);
   minClearance ??= getBoardDrcValue(board, "min_pad_edge_to_pad_edge_clearance") ?? jlcMinTolerances.min_pad_edge_to_pad_edge_clearance;
-  connMap ??= getFullConnectivityMapFromCircuitJson7(circuitJson);
+  connMap ??= getFullConnectivityMapFromCircuitJson8(circuitJson);
   const spatialIndex = new SpatialObjectIndex({
     objects: pads,
     getBounds: getPadBounds,
@@ -2028,7 +2032,7 @@ import {
   segmentToCircleMinDistance as segmentToCircleMinDistance2
 } from "@tscircuit/math-utils";
 import {
-  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson8
+  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson9
 } from "circuit-json-to-connectivity-map";
 function checkPadTraceClearance(circuitJson, {
   connMap,
@@ -2039,7 +2043,7 @@ function checkPadTraceClearance(circuitJson, {
   if (pads.length === 0 || segments.length === 0) return [];
   const board = getPcbBoard(circuitJson);
   minClearance ??= getBoardDrcValue(board, "min_trace_to_pad_edge_clearance") ?? jlcMinTolerances.min_trace_to_pad_edge_clearance;
-  connMap ??= getFullConnectivityMapFromCircuitJson8(circuitJson);
+  connMap ??= getFullConnectivityMapFromCircuitJson9(circuitJson);
   const spatialIndex = new SpatialObjectIndex({
     objects: pads,
     getBounds: getPadBounds,
@@ -2094,7 +2098,7 @@ function checkPadTraceClearance(circuitJson, {
 import { getReadableNameForElement as getReadableNameForElement8 } from "@tscircuit/circuit-json-util";
 import { segmentToCircleMinDistance as segmentToCircleMinDistance3 } from "@tscircuit/math-utils";
 import {
-  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson9
+  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson10
 } from "circuit-json-to-connectivity-map";
 var getClosestPointOnSegment = (point, segmentStart, segmentEnd) => {
   const dx = segmentEnd.x - segmentStart.x;
@@ -2122,7 +2126,7 @@ function checkViaTraceClearance(circuitJson, {
   if (vias.length === 0 || segments.length === 0) return [];
   const board = getPcbBoard(circuitJson);
   minClearance ??= getBoardDrcValue(board, "min_trace_to_pad_edge_clearance") ?? jlcMinTolerances.min_trace_to_pad_edge_clearance;
-  connMap ??= getFullConnectivityMapFromCircuitJson9(circuitJson);
+  connMap ??= getFullConnectivityMapFromCircuitJson10(circuitJson);
   const errors = /* @__PURE__ */ new Map();
   for (const via of vias) {
     const viaRadius = via.outer_diameter / 2;
@@ -2649,6 +2653,15 @@ import {
   getReadableNameForPcbPort as getReadableNameForPcbPort2,
   getReadableNameForPcbTrace
 } from "@tscircuit/circuit-json-util";
+function getRoutePointCenter(point) {
+  if (point.route_type === "through_pad") {
+    return {
+      x: (point.start.x + point.end.x) / 2,
+      y: (point.start.y + point.end.y) / 2
+    };
+  }
+  return { x: point.x, y: point.y };
+}
 function routePointConnectsToAnotherExpectedPort(point, expectedPorts, missingPcbPortId, padMap) {
   if (point.route_type !== "wire") return false;
   return expectedPorts.some((expectedPort) => {
@@ -2702,9 +2715,11 @@ function getMissingConnectionErrorCenter({
   } else if (lastWirePoint) {
     errorLocation = lastWirePoint;
   }
+  const firstPointCenter = getRoutePointCenter(firstPoint);
+  const lastPointCenter = getRoutePointCenter(lastPoint);
   return errorLocation ? { x: errorLocation.x, y: errorLocation.y } : {
-    x: (firstPoint.x + lastPoint.x) / 2,
-    y: (firstPoint.y + lastPoint.y) / 2
+    x: (firstPointCenter.x + lastPointCenter.x) / 2,
+    y: (firstPointCenter.y + lastPointCenter.y) / 2
   };
 }
 function checkTracesAreContiguous(circuitJson) {