@tscircuit/core 0.0.883 → 0.0.885

package/dist/index.js

@@ -6756,6 +6756,149 @@ function Trace_doInitialPcbTraceRender(trace) {
 
 // lib/components/primitive-components/Trace/Trace_doInitialPcbManualTraceRender.ts
 import { applyToPoint as applyToPoint7, identity as identity3 } from "transformation-matrix";
+
+// lib/utils/trace-clipping/computeLineRectIntersection.ts
+function computeLineRectIntersection(params) {
+  const { lineStart, lineEnd, rectCenter, rectWidth, rectHeight } = params;
+  const left = rectCenter.x - rectWidth / 2;
+  const right = rectCenter.x + rectWidth / 2;
+  const top = rectCenter.y + rectHeight / 2;
+  const bottom = rectCenter.y - rectHeight / 2;
+  const dx = lineEnd.x - lineStart.x;
+  const dy = lineEnd.y - lineStart.y;
+  const intersections = [];
+  if (dx !== 0) {
+    const t = (left - lineStart.x) / dx;
+    if (t >= 0 && t <= 1) {
+      const y = lineStart.y + t * dy;
+      if (y >= bottom && y <= top) {
+        intersections.push({ x: left, y, t });
+      }
+    }
+  }
+  if (dx !== 0) {
+    const t = (right - lineStart.x) / dx;
+    if (t >= 0 && t <= 1) {
+      const y = lineStart.y + t * dy;
+      if (y >= bottom && y <= top) {
+        intersections.push({ x: right, y, t });
+      }
+    }
+  }
+  if (dy !== 0) {
+    const t = (bottom - lineStart.y) / dy;
+    if (t >= 0 && t <= 1) {
+      const x = lineStart.x + t * dx;
+      if (x >= left && x <= right) {
+        intersections.push({ x, y: bottom, t });
+      }
+    }
+  }
+  if (dy !== 0) {
+    const t = (top - lineStart.y) / dy;
+    if (t >= 0 && t <= 1) {
+      const x = lineStart.x + t * dx;
+      if (x >= left && x <= right) {
+        intersections.push({ x, y: top, t });
+      }
+    }
+  }
+  if (intersections.length === 0) return null;
+  intersections.sort((a, b) => a.t - b.t);
+  return { x: intersections[0].x, y: intersections[0].y };
+}
+
+// lib/utils/trace-clipping/computeLineCircleIntersection.ts
+function computeLineCircleIntersection(params) {
+  const { lineStart, lineEnd, circleCenter, circleRadius } = params;
+  const x1 = lineStart.x - circleCenter.x;
+  const y1 = lineStart.y - circleCenter.y;
+  const x2 = lineEnd.x - circleCenter.x;
+  const y2 = lineEnd.y - circleCenter.y;
+  const dx = x2 - x1;
+  const dy = y2 - y1;
+  const a = dx * dx + dy * dy;
+  const b = 2 * (x1 * dx + y1 * dy);
+  const c = x1 * x1 + y1 * y1 - circleRadius * circleRadius;
+  const discriminant = b * b - 4 * a * c;
+  if (discriminant < 0) return null;
+  const sqrtDisc = Math.sqrt(discriminant);
+  const t1 = (-b - sqrtDisc) / (2 * a);
+  const t2 = (-b + sqrtDisc) / (2 * a);
+  let t = null;
+  if (t1 >= 0 && t1 <= 1) {
+    t = t1;
+  } else if (t2 >= 0 && t2 <= 1) {
+    t = t2;
+  }
+  if (t === null) return null;
+  return {
+    x: lineStart.x + t * dx,
+    y: lineStart.y + t * dy
+  };
+}
+
+// lib/utils/trace-clipping/clipTraceEndAtPad.ts
+function clipTraceEndAtPad(params) {
+  const { traceStart, traceEnd, traceWidth, port } = params;
+  const pcbPrimitive = port.matchedComponents.find((c) => c.isPcbPrimitive);
+  if (!pcbPrimitive) {
+    return traceEnd;
+  }
+  const padBounds = pcbPrimitive._getPcbCircuitJsonBounds();
+  const padWidth = padBounds.width;
+  const padHeight = padBounds.height;
+  const padCenter = padBounds.center;
+  const smallestPadDimension = Math.min(padWidth, padHeight);
+  if (traceWidth <= smallestPadDimension / 2) {
+    return traceEnd;
+  }
+  let clippedPoint = null;
+  if (pcbPrimitive.componentName === "SmtPad") {
+    const smtPad = pcbPrimitive;
+    const padShape = smtPad._parsedProps.shape;
+    if (padShape === "circle") {
+      const radius = smtPad._parsedProps.radius;
+      clippedPoint = computeLineCircleIntersection({
+        lineStart: traceStart,
+        lineEnd: traceEnd,
+        circleCenter: padCenter,
+        circleRadius: radius
+      });
+    } else if (padShape === "rect" || padShape === "rotated_rect" || padShape === "pill" || padShape === "polygon") {
+      clippedPoint = computeLineRectIntersection({
+        lineStart: traceStart,
+        lineEnd: traceEnd,
+        rectCenter: padCenter,
+        rectWidth: padWidth,
+        rectHeight: padHeight
+      });
+    }
+  } else if (pcbPrimitive.componentName === "PlatedHole") {
+    const platedHole = pcbPrimitive;
+    const holeShape = platedHole._parsedProps.shape;
+    if (holeShape === "circle") {
+      const outerDiameter = platedHole._parsedProps.outerDiameter;
+      clippedPoint = computeLineCircleIntersection({
+        lineStart: traceStart,
+        lineEnd: traceEnd,
+        circleCenter: padCenter,
+        circleRadius: outerDiameter / 2
+      });
+    } else {
+      clippedPoint = computeLineRectIntersection({
+        lineStart: traceStart,
+        lineEnd: traceEnd,
+        rectCenter: padCenter,
+        rectWidth: padWidth,
+        rectHeight: padHeight
+      });
+    }
+  }
+  return clippedPoint ?? traceEnd;
+}
+
+// lib/components/primitive-components/Trace/Trace_doInitialPcbManualTraceRender.ts
 function Trace_doInitialPcbManualTraceRender(trace) {
   if (trace.root?.pcbDisabled) return;
   const { db } = trace.root;
@@ -6796,19 +6939,31 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     const layer2 = sharedLayer ?? startLayers[0] ?? endLayers[0] ?? "top";
     const startPos = startPort._getGlobalPcbPositionAfterLayout();
     const endPos = endPort._getGlobalPcbPositionAfterLayout();
+    const clippedStartPos = clipTraceEndAtPad({
+      traceStart: endPos,
+      traceEnd: startPos,
+      traceWidth: width,
+      port: startPort
+    });
+    const clippedEndPos = clipTraceEndAtPad({
+      traceStart: startPos,
+      traceEnd: endPos,
+      traceWidth: width,
+      port: endPort
+    });
     const route2 = [
       {
         route_type: "wire",
-        x: startPos.x,
-        y: startPos.y,
+        x: clippedStartPos.x,
+        y: clippedStartPos.y,
         width,
         layer: layer2,
         start_pcb_port_id: startPort.pcb_port_id
       },
       {
         route_type: "wire",
-        x: endPos.x,
-        y: endPos.y,
+        x: clippedEndPos.x,
+        y: clippedEndPos.y,
         width,
         layer: layer2,
         end_pcb_port_id: endPort.pcb_port_id
@@ -18635,7 +18790,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.882",
+  version: "0.0.884",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18740,7 +18895,7 @@ var package_default = {
   dependencies: {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.58",
+    "calculate-packing": "0.0.62",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     nanoid: "^5.0.7",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.883",
+  "version": "0.0.885",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -106,7 +106,7 @@
   "dependencies": {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.58",
+    "calculate-packing": "0.0.62",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     "nanoid": "^5.0.7",