@tscircuit/core 0.0.884 → 0.0.886

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
@@ -18534,7 +18689,7 @@ var VoltageProbe = class extends PrimitiveComponent2 {
   }
   doInitialSimulationRender() {
     const { db } = this.root;
-    const { connectsTo, name } = this._parsedProps;
+    const { connectsTo, name, referenceTo, color } = this._parsedProps;
     const subcircuit = this.getSubcircuit();
     if (!subcircuit) {
       this.renderError("VoltageProbe must be inside a subcircuit");
@@ -18567,7 +18722,35 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       this.renderError(`Could not identify connected source for VoltageProbe`);
       return;
     }
-    this.color = getSimulationColorForId(connectedId);
+    let referencePort = null;
+    let referenceNet = null;
+    if (referenceTo) {
+      const referenceTargets = Array.isArray(referenceTo) ? referenceTo : [referenceTo];
+      if (referenceTargets.length !== 1) {
+        this.renderError("VoltageProbe must reference exactly one port or net");
+        return;
+      }
+      const referenceSelector = referenceTargets[0];
+      referencePort = subcircuit.selectOne(referenceSelector, {
+        type: "port"
+      });
+      referenceNet = !referencePort ? subcircuit.selectOne(referenceSelector, {
+        type: "net"
+      }) : null;
+      if (referenceNet && referenceNet.componentName !== "Net") {
+        this.renderError(
+          `VoltageProbe reference target "${referenceSelector}" resolved to a non-net component "${referenceNet.componentName}".`
+        );
+        return;
+      }
+      if (!referencePort && !referenceNet) {
+        this.renderError(
+          `VoltageProbe could not find reference target "${referenceSelector}"`
+        );
+        return;
+      }
+    }
+    this.color = color ?? getSimulationColorForId(connectedId);
     let finalName = name;
     if (!finalName) {
       finalName = targets[0].split(" > ").map((s) => s.replace(/^\./, "")).join(".");
@@ -18577,6 +18760,8 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       name: finalName,
       signal_input_source_port_id: port?.source_port_id ?? void 0,
       signal_input_source_net_id: net?.source_net_id ?? void 0,
+      reference_input_source_port_id: referencePort?.source_port_id ?? void 0,
+      reference_input_source_net_id: referenceNet?.source_net_id ?? void 0,
       subcircuit_id: subcircuit.subcircuit_id || void 0,
       color: this.color
     });
@@ -18635,7 +18820,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   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",
@@ -18698,7 +18883,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-gltf": "^0.0.31",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.25",
+    "circuit-json-to-spice": "^0.0.26",
     "circuit-to-svg": "^0.0.280",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.884",
+  "version": "0.0.886",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -64,7 +64,7 @@
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-gltf": "^0.0.31",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.25",
+    "circuit-json-to-spice": "^0.0.26",
     "circuit-to-svg": "^0.0.280",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",