circuit-to-svg 0.0.101 → 0.0.103

package/dist/index.js

@@ -1,7 +1,7 @@
 // lib/pcb/convert-circuit-json-to-pcb-svg.ts
 import { stringify } from "svgson";
 import {
-  applyToPoint as applyToPoint12,
+  applyToPoint as applyToPoint16,
   compose as compose3,
   scale,
   translate as translate3
@@ -374,6 +374,129 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
   return [svgObject];
 }
 
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-rect.ts
+import {
+  applyToPoint as applyToPoint7
+} from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
+  const {
+    center,
+    width,
+    height,
+    layer = "top",
+    pcb_silkscreen_rect_id
+  } = pcbSilkscreenRect;
+  if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
+    console.error("Invalid rectangle data:", { center, width, height });
+    return [];
+  }
+  const [transformedX, transformedY] = applyToPoint7(transform, [
+    center.x,
+    center.y
+  ]);
+  const transformedWidth = width * Math.abs(transform.a);
+  const transformedHeight = height * Math.abs(transform.d);
+  const svgObject = {
+    name: "rect",
+    type: "element",
+    attributes: {
+      x: (transformedX - transformedWidth / 2).toString(),
+      y: (transformedY - transformedHeight / 2).toString(),
+      width: transformedWidth.toString(),
+      height: transformedHeight.toString(),
+      class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
+      stroke: "red",
+      "stroke-width": "1",
+      "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
+    },
+    value: "",
+    children: []
+  };
+  return [svgObject];
+}
+
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-circle.ts
+import {
+  applyToPoint as applyToPoint8
+} from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform) {
+  const {
+    center,
+    radius,
+    layer = "top",
+    pcb_silkscreen_circle_id
+  } = pcbSilkscreenCircle;
+  if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof radius !== "number") {
+    console.error("Invalid PCB Silkscreen Circle data:", { center, radius });
+    return [];
+  }
+  const [transformedX, transformedY] = applyToPoint8(transform, [
+    center.x,
+    center.y
+  ]);
+  const transformedRadius = radius * Math.abs(transform.a);
+  console.debug(
+    `Transformed Circle - X: ${transformedX}, Y: ${transformedY}, Radius: ${transformedRadius}`
+  );
+  const svgObject = {
+    name: "circle",
+    type: "element",
+    attributes: {
+      cx: transformedX.toString(),
+      cy: transformedY.toString(),
+      r: transformedRadius.toString(),
+      class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
+      stroke: "red",
+      "stroke-width": "3",
+      "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
+    },
+    value: "",
+    children: []
+  };
+  console.log(svgObject);
+  return [svgObject];
+}
+
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-line.ts
+import {
+  applyToPoint as applyToPoint9
+} from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
+  const {
+    x1,
+    y1,
+    x2,
+    y2,
+    stroke_width,
+    layer = "top",
+    pcb_silkscreen_line_id
+  } = pcbSilkscreenLine;
+  if (typeof x1 !== "number" || typeof y1 !== "number" || typeof x2 !== "number" || typeof y2 !== "number") {
+    console.error("Invalid coordinates:", { x1, y1, x2, y2 });
+    return [];
+  }
+  const [transformedX1, transformedY1] = applyToPoint9(transform, [x1, y1]);
+  const [transformedX2, transformedY2] = applyToPoint9(transform, [x2, y2]);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
+  return [
+    {
+      name: "line",
+      type: "element",
+      attributes: {
+        x1: transformedX1.toString(),
+        y1: transformedY1.toString(),
+        x2: transformedX2.toString(),
+        y2: transformedY2.toString(),
+        "stroke-width": transformedStrokeWidth.toString(),
+        class: `pcb-silkscreen-line pcb-silkscreen-${layer}`,
+        "data-pcb-silkscreen-line-id": pcb_silkscreen_line_id
+      },
+      value: "",
+      children: []
+    }
+  ];
+}
+
 // lib/utils/pairs.ts
 function pairs(arr) {
   const result = [];
@@ -384,7 +507,7 @@ function pairs(arr) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
-import { applyToPoint as applyToPoint7 } from "transformation-matrix";
+import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 
 // lib/pcb/layer-name-to-color.ts
 var LAYER_NAME_TO_COLOR = {
@@ -402,8 +525,8 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
   const segments = pairs(trace.route);
   const svgObjects = [];
   for (const [start, end] of segments) {
-    const startPoint = applyToPoint7(transform, [start.x, start.y]);
-    const endPoint = applyToPoint7(transform, [end.x, end.y]);
+    const startPoint = applyToPoint10(transform, [start.x, start.y]);
+    const endPoint = applyToPoint10(transform, [end.x, end.y]);
     const layer = "layer" in start ? start.layer : "layer" in end ? end.layer : null;
     if (!layer) continue;
     const layerColor = LAYER_NAME_TO_COLOR[layer] ?? "white";
@@ -428,9 +551,9 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-smt-pads.ts
-import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11 } from "transformation-matrix";
 function createSvgObjectsFromSmtPad(pad, transform) {
-  const [x, y] = applyToPoint8(transform, [pad.x, pad.y]);
+  const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
@@ -491,31 +614,31 @@ function createSvgObjectsFromSmtPad(pad, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-board.ts
-import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 function createSvgObjectsFromPcbBoard(pcbBoard, transform) {
   const { width, height, center, outline } = pcbBoard;
   let path;
   if (outline && Array.isArray(outline) && outline.length >= 3) {
     path = outline.map((point, index) => {
-      const [x, y] = applyToPoint9(transform, [point.x, point.y]);
+      const [x, y] = applyToPoint12(transform, [point.x, point.y]);
       return index === 0 ? `M ${x} ${y}` : `L ${x} ${y}`;
     }).join(" ");
   } else {
     const halfWidth = width / 2;
     const halfHeight = height / 2;
-    const topLeft = applyToPoint9(transform, [
+    const topLeft = applyToPoint12(transform, [
       center.x - halfWidth,
       center.y - halfHeight
     ]);
-    const topRight = applyToPoint9(transform, [
+    const topRight = applyToPoint12(transform, [
       center.x + halfWidth,
       center.y - halfHeight
     ]);
-    const bottomRight = applyToPoint9(transform, [
+    const bottomRight = applyToPoint12(transform, [
       center.x + halfWidth,
       center.y + halfHeight
     ]);
-    const bottomLeft = applyToPoint9(transform, [
+    const bottomLeft = applyToPoint12(transform, [
       center.x - halfWidth,
       center.y + halfHeight
     ]);
@@ -539,9 +662,9 @@ function createSvgObjectsFromPcbBoard(pcbBoard, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-via.ts
-import { applyToPoint as applyToPoint10 } from "transformation-matrix";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
 function createSvgObjectsFromPcbVia(hole, transform) {
-  const [x, y] = applyToPoint10(transform, [hole.x, hole.y]);
+  const [x, y] = applyToPoint13(transform, [hole.x, hole.y]);
   const scaledOuterWidth = hole.outer_diameter * Math.abs(transform.a);
   const scaledOuterHeight = hole.outer_diameter * Math.abs(transform.a);
   const scaledHoleWidth = hole.hole_diameter * Math.abs(transform.a);
@@ -577,14 +700,14 @@ function createSvgObjectsFromPcbVia(hole, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
-import { applyToPoint as applyToPoint11 } from "transformation-matrix";
+import { applyToPoint as applyToPoint14 } from "transformation-matrix";
 
 // lib/pcb/colors.ts
 var HOLE_COLOR = "#FF26E2";
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 function createSvgObjectsFromPcbHole(hole, transform) {
-  const [x, y] = applyToPoint11(transform, [hole.x, hole.y]);
+  const [x, y] = applyToPoint14(transform, [hole.x, hole.y]);
   if (hole.hole_shape === "circle" || hole.hole_shape === "square") {
     const scaledDiameter = hole.hole_diameter * Math.abs(transform.a);
     const radius = scaledDiameter / 2;
@@ -647,6 +770,118 @@ function createSvgObjectsFromPcbHole(hole, transform) {
   return [];
 }
 
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-rats-nests.ts
+import {
+  getFullConnectivityMapFromCircuitJson
+} from "circuit-json-to-connectivity-map";
+import "svgson";
+import { applyToPoint as applyToPoint15 } from "transformation-matrix";
+
+// lib/pcb/create-svg-objects-from-pcb-rats-nest/get-element-position.ts
+import { su } from "@tscircuit/soup-util";
+var getElementPosition = (id, circuitJson) => {
+  const pcbSmtpad = su(circuitJson).pcb_smtpad.get(id);
+  if (pcbSmtpad && "x" in pcbSmtpad && "y" in pcbSmtpad) {
+    return { x: pcbSmtpad.x, y: pcbSmtpad.y };
+  }
+  const pcbPlatedHole = su(circuitJson).pcb_plated_hole.get(id);
+  if (pcbPlatedHole && "x" in pcbPlatedHole && "y" in pcbPlatedHole) {
+    return { x: pcbPlatedHole.x, y: pcbPlatedHole.y };
+  }
+  return null;
+};
+
+// lib/pcb/create-svg-objects-from-pcb-rats-nest/find-nearest-point-in-nest.ts
+import "circuit-json-to-connectivity-map";
+var findNearestPointInNet = (sourcePoint, netId, connectivity, circuitJson) => {
+  const connectedIds = connectivity.getIdsConnectedToNet(netId);
+  let nearestPoint = null;
+  let minDistance = Infinity;
+  for (const id of connectedIds) {
+    const pos = getElementPosition(id, circuitJson);
+    if (pos) {
+      const dx = sourcePoint.x - pos.x;
+      const dy = sourcePoint.y - pos.y;
+      const distance = Math.sqrt(dx * dx + dy * dy);
+      if (distance > 0 && distance < minDistance) {
+        minDistance = distance;
+        nearestPoint = pos;
+      }
+    }
+  }
+  return nearestPoint;
+};
+
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-rats-nests.ts
+import { su as su2 } from "@tscircuit/soup-util";
+function createSvgObjectsForRatsNest(circuitJson, transform) {
+  const connectivity = getFullConnectivityMapFromCircuitJson(circuitJson);
+  const pcbPorts = circuitJson.filter((elm) => elm.type === "pcb_port");
+  const sourceTraces = circuitJson.filter((elm) => elm.type === "source_trace");
+  const ratsNestLines = [];
+  pcbPorts.forEach((port, index) => {
+    const portId = port.pcb_port_id;
+    if (!portId) return;
+    const netId = connectivity.getNetConnectedToId(portId);
+    if (!netId) return;
+    let isInNet = false;
+    const sourcePort = su2(circuitJson).source_port.getWhere({
+      pcb_port_id: portId
+    });
+    if (sourcePort && sourcePort.source_port_id) {
+      const sourcePortId = sourcePort.source_port_id;
+      for (const trace of sourceTraces) {
+        if (Array.isArray(trace.connected_source_port_ids) && trace.connected_source_port_ids.includes(sourcePortId) && Array.isArray(trace.connected_source_net_ids) && trace.connected_source_net_ids.length > 0) {
+          isInNet = true;
+          break;
+        }
+      }
+    }
+    const startPoint = { x: port.x, y: port.y };
+    const nearestPoint = findNearestPointInNet(
+      startPoint,
+      netId,
+      connectivity,
+      circuitJson
+    );
+    if (!nearestPoint) return;
+    ratsNestLines.push({
+      key: `${portId}-${index}`,
+      startPoint,
+      endPoint: nearestPoint,
+      isInNet
+    });
+  });
+  const svgObjects = [];
+  for (const line of ratsNestLines) {
+    const transformedStart = applyToPoint15(transform, [
+      line.startPoint.x,
+      line.startPoint.y
+    ]);
+    const transformedEnd = applyToPoint15(transform, [
+      line.endPoint.x,
+      line.endPoint.y
+    ]);
+    const attributes = {
+      x1: transformedStart[0].toString(),
+      y1: transformedStart[1].toString(),
+      x2: transformedEnd[0].toString(),
+      y2: transformedEnd[1].toString(),
+      stroke: "white",
+      "stroke-width": "1",
+      "stroke-dasharray": "6,6"
+    };
+    svgObjects.push({
+      name: "line",
+      type: "element",
+      attributes,
+      value: "",
+      children: []
+    });
+  }
+  return svgObjects;
+}
+
 // lib/pcb/convert-circuit-json-to-pcb-svg.ts
 var OBJECT_ORDER = [
   "pcb_trace_error",
@@ -702,7 +937,7 @@ function convertCircuitJsonToPcbSvg(soup, options) {
     scale(scaleFactor, -scaleFactor)
     // Flip in y-direction
   );
-  const svgObjects = soup.sort(
+  let svgObjects = soup.sort(
     (a, b) => (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999)
   ).flatMap(
     (item) => createSvgObjects(item, transform, soup, options?.shouldDrawErrors)
@@ -714,6 +949,10 @@ function convertCircuitJsonToPcbSvg(soup, options) {
       break;
     }
   }
+  if (options?.shouldDrawRatsNest) {
+    const ratsNestObjects = createSvgObjectsForRatsNest(soup, transform);
+    svgObjects = svgObjects.concat(ratsNestObjects);
+  }
   const svgObject = {
     name: "svg",
     type: "element",
@@ -813,6 +1052,12 @@ function createSvgObjects(elm, transform, soup, shouldDrawErrors) {
       return createSvgObjectsFromSmtPad(elm, transform);
     case "pcb_silkscreen_text":
       return createSvgObjectsFromPcbSilkscreenText(elm, transform);
+    case "pcb_silkscreen_rect":
+      return createSvgObjectsFromPcbSilkscreenRect(elm, transform);
+    case "pcb_silkscreen_circle":
+      return createSvgObjectsFromPcbSilkscreenCircle(elm, transform);
+    case "pcb_silkscreen_line":
+      return createSvgObjectsFromPcbSilkscreenLine(elm, transform);
     case "pcb_fabrication_note_path":
       return createSvgObjectsFromPcbFabricationNotePath(elm, transform);
     case "pcb_fabrication_note_text":
@@ -829,7 +1074,7 @@ function createSvgObjects(elm, transform, soup, shouldDrawErrors) {
 }
 function createSvgObjectsFromPcbComponent(component, transform) {
   const { center, width, height, rotation = 0 } = component;
-  const [x, y] = applyToPoint12(transform, [center.x, center.y]);
+  const [x, y] = applyToPoint16(transform, [center.x, center.y]);
   const scaledWidth = width * Math.abs(transform.a);
   const scaledHeight = height * Math.abs(transform.d);
   const transformStr = `translate(${x}, ${y}) rotate(${-rotation}) scale(1, -1)`;
@@ -864,8 +1109,8 @@ function createSvgObjectsFromPcbComponent(component, transform) {
   };
 }
 function createSvgObjectFromPcbBoundary(transform, minX, minY, maxX, maxY) {
-  const [x1, y1] = applyToPoint12(transform, [minX, minY]);
-  const [x2, y2] = applyToPoint12(transform, [maxX, maxY]);
+  const [x1, y1] = applyToPoint16(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint16(transform, [maxX, maxY]);
   const width = Math.abs(x2 - x1);
   const height = Math.abs(y2 - y1);
   const x = Math.min(x1, x2);
@@ -888,16 +1133,16 @@ var circuitJsonToPcbSvg = convertCircuitJsonToPcbSvg;
 
 // lib/assembly/convert-circuit-json-to-assembly-svg.ts
 import { stringify as stringify2 } from "svgson";
-import { su } from "@tscircuit/soup-util";
+import { su as su3 } from "@tscircuit/soup-util";
 import {
-  applyToPoint as applyToPoint16,
+  applyToPoint as applyToPoint20,
   compose as compose4,
   scale as scale2,
   translate as translate4
 } from "transformation-matrix";
 
 // lib/assembly/svg-object-fns/create-svg-objects-from-assembly-board.ts
-import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { applyToPoint as applyToPoint17 } from "transformation-matrix";
 var DEFAULT_BOARD_STYLE = {
   fill: "none",
   stroke: "rgb(0,0,0)",
@@ -909,25 +1154,25 @@ function createSvgObjectsFromAssemblyBoard(pcbBoard, transform, style = {}) {
   let path;
   if (outline && Array.isArray(outline) && outline.length >= 3) {
     path = outline.map((point, index) => {
-      const [x, y] = applyToPoint13(transform, [point.x, point.y]);
+      const [x, y] = applyToPoint17(transform, [point.x, point.y]);
       return index === 0 ? `M ${x} ${y}` : `L ${x} ${y}`;
     }).join(" ");
   } else {
     const halfWidth = width / 2;
     const halfHeight = height / 2;
-    const topLeft = applyToPoint13(transform, [
+    const topLeft = applyToPoint17(transform, [
       center.x - halfWidth,
       center.y - halfHeight
     ]);
-    const topRight = applyToPoint13(transform, [
+    const topRight = applyToPoint17(transform, [
       center.x + halfWidth,
       center.y - halfHeight
     ]);
-    const bottomRight = applyToPoint13(transform, [
+    const bottomRight = applyToPoint17(transform, [
       center.x + halfWidth,
       center.y + halfHeight
     ]);
-    const bottomLeft = applyToPoint13(transform, [
+    const bottomLeft = applyToPoint17(transform, [
       center.x - halfWidth,
       center.y + halfHeight
     ]);
@@ -953,7 +1198,7 @@ function createSvgObjectsFromAssemblyBoard(pcbBoard, transform, style = {}) {
 }
 
 // lib/assembly/svg-object-fns/create-svg-objects-from-assembly-component.ts
-import { applyToPoint as applyToPoint15 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19 } from "transformation-matrix";
 
 // lib/utils/get-sch-font-size.ts
 import "transformation-matrix";
@@ -967,8 +1212,8 @@ var getSchScreenFontSize = (transform, textType) => {
 // lib/assembly/svg-object-fns/create-svg-objects-from-assembly-component.ts
 function createSvgObjectsFromAssemblyComponent(component, transform, firstPin, name) {
   const { center, width, height, rotation = 0 } = component;
-  const [x, y] = applyToPoint15(transform, [center.x, center.y]);
-  const [pinX, pinY] = applyToPoint15(transform, [firstPin.x, firstPin.y]);
+  const [x, y] = applyToPoint19(transform, [center.x, center.y]);
+  const [pinX, pinY] = applyToPoint19(transform, [firstPin.x, firstPin.y]);
   const scaledWidth = width * Math.abs(transform.a);
   const scaledHeight = height * Math.abs(transform.d);
   return {
@@ -1177,7 +1422,7 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
   return stringify2(svgObject);
 }
 function createSvgObjects2(elm, transform, soup) {
-  const sourceComponents = su(soup).source_component.list();
+  const sourceComponents = su3(soup).source_component.list();
   switch (elm.type) {
     case "pcb_board":
       return createSvgObjectsFromAssemblyBoard(elm, transform);
@@ -1185,7 +1430,7 @@ function createSvgObjects2(elm, transform, soup) {
       const sourceComponent = sourceComponents.find(
         (item) => item.source_component_id === elm.source_component_id
       );
-      const ports = su(soup).pcb_port.list().filter((port) => port.pcb_component_id === elm.pcb_component_id);
+      const ports = su3(soup).pcb_port.list().filter((port) => port.pcb_component_id === elm.pcb_component_id);
       const firstPort = ports[0];
       if (sourceComponent && firstPort) {
         return [
@@ -1204,8 +1449,8 @@ function createSvgObjects2(elm, transform, soup) {
   }
 }
 function createSvgObjectFromAssemblyBoundary(transform, minX, minY, maxX, maxY) {
-  const [x1, y1] = applyToPoint16(transform, [minX, minY]);
-  const [x2, y2] = applyToPoint16(transform, [maxX, maxY]);
+  const [x1, y1] = applyToPoint20(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint20(transform, [maxX, maxY]);
   const width = Math.abs(x2 - x1);
   const height = Math.abs(y2 - y1);
   const x = Math.min(x1, x2);
@@ -1470,14 +1715,14 @@ import {
 } from "transformation-matrix";
 
 // lib/sch/draw-schematic-grid.ts
-import { applyToPoint as applyToPoint17 } from "transformation-matrix";
+import { applyToPoint as applyToPoint21 } from "transformation-matrix";
 function drawSchematicGrid(params) {
   const { minX, minY, maxX, maxY } = params.bounds;
   const cellSize = params.cellSize ?? 1;
   const labelCells = params.labelCells ?? false;
   const gridLines = [];
   const transformPoint = (x, y) => {
-    const [transformedX, transformedY] = applyToPoint17(params.transform, [x, y]);
+    const [transformedX, transformedY] = applyToPoint21(params.transform, [x, y]);
     return { x: transformedX, y: transformedY };
   };
   for (let x = Math.floor(minX); x <= Math.ceil(maxX); x += cellSize) {
@@ -1558,15 +1803,15 @@ function drawSchematicGrid(params) {
 }
 
 // lib/sch/draw-schematic-labeled-points.ts
-import { applyToPoint as applyToPoint18 } from "transformation-matrix";
+import { applyToPoint as applyToPoint22 } from "transformation-matrix";
 function drawSchematicLabeledPoints(params) {
   const { points, transform } = params;
   const labeledPointsGroup = [];
   for (const point of points) {
-    const [x1, y1] = applyToPoint18(transform, [point.x - 0.1, point.y - 0.1]);
-    const [x2, y2] = applyToPoint18(transform, [point.x + 0.1, point.y + 0.1]);
-    const [x3, y3] = applyToPoint18(transform, [point.x - 0.1, point.y + 0.1]);
-    const [x4, y4] = applyToPoint18(transform, [point.x + 0.1, point.y - 0.1]);
+    const [x1, y1] = applyToPoint22(transform, [point.x - 0.1, point.y - 0.1]);
+    const [x2, y2] = applyToPoint22(transform, [point.x + 0.1, point.y + 0.1]);
+    const [x3, y3] = applyToPoint22(transform, [point.x - 0.1, point.y + 0.1]);
+    const [x4, y4] = applyToPoint22(transform, [point.x + 0.1, point.y - 0.1]);
     labeledPointsGroup.push({
       name: "path",
       type: "element",
@@ -1577,7 +1822,7 @@ function drawSchematicLabeledPoints(params) {
         "stroke-opacity": "0.7"
       }
     });
-    const [labelX, labelY] = applyToPoint18(transform, [
+    const [labelX, labelY] = applyToPoint22(transform, [
       point.x + 0.15,
       point.y - 0.15
     ]);
@@ -1676,11 +1921,11 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-component-with-symbol.ts
-import { su as su2 } from "@tscircuit/soup-util";
+import { su as su4 } from "@tscircuit/soup-util";
 import { symbols } from "schematic-symbols";
 import "svgson";
 import {
-  applyToPoint as applyToPoint20,
+  applyToPoint as applyToPoint24,
   compose as compose6
 } from "transformation-matrix";
 
@@ -1764,13 +2009,13 @@ function pointPairsToMatrix(a1, a2, b1, b2) {
 }
 
 // lib/sch/svg-object-fns/create-svg-error-text.ts
-import { applyToPoint as applyToPoint19 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23 } from "transformation-matrix";
 var createSvgSchErrorText = ({
   text,
   realCenter,
   realToScreenTransform
 }) => {
-  const screenCenter = applyToPoint19(realToScreenTransform, realCenter);
+  const screenCenter = applyToPoint23(realToScreenTransform, realCenter);
   return {
     type: "element",
     name: "text",
@@ -1824,10 +2069,10 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
       })
     ];
   }
-  const schPorts = su2(circuitJson).schematic_port.list({
+  const schPorts = su4(circuitJson).schematic_port.list({
     schematic_component_id: schComponent.schematic_component_id
   });
-  const srcComponent = su2(circuitJson).source_component.get(
+  const srcComponent = su4(circuitJson).source_component.get(
     schComponent.source_component_id
   );
   const schPortsWithSymbolPorts = matchSchPortsToSymbolPorts({
@@ -1860,11 +2105,11 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     minY: Math.min(...paths.flatMap((p) => p.points.map((pt) => pt.y))),
     maxY: Math.max(...paths.flatMap((p) => p.points.map((pt) => pt.y)))
   };
-  const [screenMinX, screenMinY] = applyToPoint20(
+  const [screenMinX, screenMinY] = applyToPoint24(
     compose6(realToScreenTransform, transformFromSymbolToReal),
     [bounds.minX, bounds.minY]
   );
-  const [screenMaxX, screenMaxY] = applyToPoint20(
+  const [screenMaxX, screenMaxY] = applyToPoint24(
     compose6(realToScreenTransform, transformFromSymbolToReal),
     [bounds.maxX, bounds.maxY]
   );
@@ -1893,7 +2138,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
       name: "path",
       attributes: {
         d: points.map((p, i) => {
-          const [x, y] = applyToPoint20(
+          const [x, y] = applyToPoint24(
             compose6(realToScreenTransform, transformFromSymbolToReal),
             [p.x, p.y]
           );
@@ -1908,7 +2153,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     });
   }
   for (const text of texts) {
-    const screenTextPos = applyToPoint20(
+    const screenTextPos = applyToPoint24(
       compose6(realToScreenTransform, transformFromSymbolToReal),
       text
     );
@@ -1954,7 +2199,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     });
   }
   for (const box of boxes) {
-    const screenBoxPos = applyToPoint20(
+    const screenBoxPos = applyToPoint24(
       compose6(realToScreenTransform, transformFromSymbolToReal),
       box
     );
@@ -1977,7 +2222,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     });
   }
   for (const port of symbol.ports) {
-    const screenPortPos = applyToPoint20(
+    const screenPortPos = applyToPoint24(
       compose6(realToScreenTransform, transformFromSymbolToReal),
       port
     );
@@ -2000,18 +2245,18 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
 };
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-component-with-box.ts
-import { su as su5 } from "@tscircuit/soup-util";
+import { su as su7 } from "@tscircuit/soup-util";
 import "schematic-symbols";
 import "svgson";
-import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { applyToPoint as applyToPoint30 } from "transformation-matrix";
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-port-on-box.ts
 import "transformation-matrix";
 import "@tscircuit/soup-util";
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-port-box-line.ts
-import { applyToPoint as applyToPoint21 } from "transformation-matrix";
-import { su as su3 } from "@tscircuit/soup-util";
+import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { su as su5 } from "@tscircuit/soup-util";
 var PIN_CIRCLE_RADIUS_MM = 0.02;
 var createSvgObjectsForSchPortBoxLine = ({
   schPort,
@@ -2020,7 +2265,7 @@ var createSvgObjectsForSchPortBoxLine = ({
   circuitJson
 }) => {
   const svgObjects = [];
-  const srcPort = su3(circuitJson).source_port.get(schPort.source_port_id);
+  const srcPort = su5(circuitJson).source_port.get(schPort.source_port_id);
   const realEdgePos = {
     x: schPort.center.x,
     y: schPort.center.y
@@ -2040,8 +2285,8 @@ var createSvgObjectsForSchPortBoxLine = ({
       realEdgePos.y += realPinLineLength;
       break;
   }
-  const screenSchPortPos = applyToPoint21(transform, schPort.center);
-  const screenRealEdgePos = applyToPoint21(transform, realEdgePos);
+  const screenSchPortPos = applyToPoint25(transform, schPort.center);
+  const screenRealEdgePos = applyToPoint25(transform, realEdgePos);
   const realLineEnd = { ...schPort.center };
   switch (schPort.side_of_component) {
     case "left":
@@ -2057,7 +2302,7 @@ var createSvgObjectsForSchPortBoxLine = ({
       realLineEnd.y += PIN_CIRCLE_RADIUS_MM;
       break;
   }
-  const screenLineEnd = applyToPoint21(transform, realLineEnd);
+  const screenLineEnd = applyToPoint25(transform, realLineEnd);
   svgObjects.push({
     name: "line",
     type: "element",
@@ -2104,7 +2349,7 @@ var getUnitVectorFromOutsideToEdge = (side) => {
 };
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-port-pin-number-text.ts
-import { applyToPoint as applyToPoint22 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
 var createSvgObjectsForSchPortPinNumberText = (params) => {
   const svgObjects = [];
   const { schPort, schComponent, transform, circuitJson } = params;
@@ -2122,7 +2367,7 @@ var createSvgObjectsForSchPortPinNumberText = (params) => {
   } else {
     realPinNumberPos.y += 0.02;
   }
-  const screenPinNumberTextPos = applyToPoint22(transform, realPinNumberPos);
+  const screenPinNumberTextPos = applyToPoint26(transform, realPinNumberPos);
   svgObjects.push({
     name: "text",
     type: "element",
@@ -2152,7 +2397,7 @@ var createSvgObjectsForSchPortPinNumberText = (params) => {
 };
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-port-pin-label.ts
-import { applyToPoint as applyToPoint23 } from "transformation-matrix";
+import { applyToPoint as applyToPoint27 } from "transformation-matrix";
 var LABEL_DIST_FROM_EDGE_MM = 0.1;
 var createSvgObjectsForSchPortPinLabel = (params) => {
   const svgObjects = [];
@@ -2166,7 +2411,7 @@ var createSvgObjectsForSchPortPinLabel = (params) => {
   const realPinEdgeDistance = schPort.distance_from_component_edge ?? 0.4;
   realPinNumberPos.x += vecToEdge.x * (realPinEdgeDistance + LABEL_DIST_FROM_EDGE_MM);
   realPinNumberPos.y += vecToEdge.y * (realPinEdgeDistance + LABEL_DIST_FROM_EDGE_MM);
-  const screenPinNumberTextPos = applyToPoint23(transform, realPinNumberPos);
+  const screenPinNumberTextPos = applyToPoint27(transform, realPinNumberPos);
   const label = schPort.display_pin_label ?? schComponent.port_labels?.[`${schPort.pin_number}`];
   if (!label) return [];
   svgObjects.push({
@@ -2208,9 +2453,9 @@ var createSvgObjectsFromSchPortOnBox = (params) => {
 };
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-text.ts
-import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { applyToPoint as applyToPoint29 } from "transformation-matrix";
 var createSvgSchText = (elm, transform) => {
-  const center = applyToPoint25(transform, elm.position);
+  const center = applyToPoint29(transform, elm.position);
   const textAnchorMap = {
     center: "middle",
     left: "start",
@@ -2258,11 +2503,11 @@ var createSvgObjectsFromSchematicComponentWithBox = ({
   circuitJson
 }) => {
   const svgObjects = [];
-  const componentScreenTopLeft = applyToPoint26(transform, {
+  const componentScreenTopLeft = applyToPoint30(transform, {
     x: schComponent.center.x - schComponent.size.width / 2,
     y: schComponent.center.y + schComponent.size.height / 2
   });
-  const componentScreenBottomRight = applyToPoint26(transform, {
+  const componentScreenBottomRight = applyToPoint30(transform, {
     x: schComponent.center.x + schComponent.size.width / 2,
     y: schComponent.center.y - schComponent.size.height / 2
   });
@@ -2298,13 +2543,13 @@ var createSvgObjectsFromSchematicComponentWithBox = ({
     },
     children: []
   });
-  const schTexts = su5(circuitJson).schematic_text.list();
+  const schTexts = su7(circuitJson).schematic_text.list();
   for (const schText of schTexts) {
     if (schText.schematic_component_id === schComponent.schematic_component_id) {
       svgObjects.push(createSvgSchText(schText, transform));
     }
   }
-  const schematicPorts = su5(circuitJson).schematic_port.list({
+  const schematicPorts = su7(circuitJson).schematic_port.list({
     schematic_component_id: schComponent.schematic_component_id
   });
   for (const schPort of schematicPorts) {
@@ -2339,9 +2584,9 @@ function createSvgObjectsFromSchematicComponent(params) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-voltage-probe.ts
-import { applyToPoint as applyToPoint27 } from "transformation-matrix";
+import { applyToPoint as applyToPoint31 } from "transformation-matrix";
 function createSvgObjectsFromSchVoltageProbe(probe, transform) {
-  const [screenX, screenY] = applyToPoint27(transform, [
+  const [screenX, screenY] = applyToPoint31(transform, [
     probe.position.x,
     probe.position.y
   ]);
@@ -2401,14 +2646,14 @@ function createSvgObjectsFromSchVoltageProbe(probe, transform) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-debug-object.ts
-import { applyToPoint as applyToPoint28 } from "transformation-matrix";
+import { applyToPoint as applyToPoint32 } from "transformation-matrix";
 function createSvgObjectsFromSchDebugObject(debugObject, transform) {
   if (debugObject.shape === "rect") {
-    let [screenLeft, screenTop] = applyToPoint28(transform, [
+    let [screenLeft, screenTop] = applyToPoint32(transform, [
       debugObject.center.x - debugObject.size.width / 2,
       debugObject.center.y - debugObject.size.height / 2
     ]);
-    let [screenRight, screenBottom] = applyToPoint28(transform, [
+    let [screenRight, screenBottom] = applyToPoint32(transform, [
       debugObject.center.x + debugObject.size.width / 2,
       debugObject.center.y + debugObject.size.height / 2
     ]);
@@ -2418,7 +2663,7 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
     ];
     const width = Math.abs(screenRight - screenLeft);
     const height = Math.abs(screenBottom - screenTop);
-    const [screenCenterX, screenCenterY] = applyToPoint28(transform, [
+    const [screenCenterX, screenCenterY] = applyToPoint32(transform, [
       debugObject.center.x,
       debugObject.center.y
     ]);
@@ -2464,11 +2709,11 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
     ];
   }
   if (debugObject.shape === "line") {
-    const [screenStartX, screenStartY] = applyToPoint28(transform, [
+    const [screenStartX, screenStartY] = applyToPoint32(transform, [
       debugObject.start.x,
       debugObject.start.y
     ]);
-    const [screenEndX, screenEndY] = applyToPoint28(transform, [
+    const [screenEndX, screenEndY] = applyToPoint32(transform, [
       debugObject.end.x,
       debugObject.end.y
     ]);
@@ -2518,7 +2763,7 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-trace.ts
-import { applyToPoint as applyToPoint29 } from "transformation-matrix";
+import { applyToPoint as applyToPoint33 } from "transformation-matrix";
 function createSchematicTrace(trace, transform) {
   const edges = trace.edges;
   if (edges.length === 0) return [];
@@ -2527,11 +2772,11 @@ function createSchematicTrace(trace, transform) {
   for (let edgeIndex = 0; edgeIndex < edges.length; edgeIndex++) {
     const edge = edges[edgeIndex];
     if (edge.is_crossing) continue;
-    const [screenFromX, screenFromY] = applyToPoint29(transform, [
+    const [screenFromX, screenFromY] = applyToPoint33(transform, [
       edge.from.x,
       edge.from.y
     ]);
-    const [screenToX, screenToY] = applyToPoint29(transform, [
+    const [screenToX, screenToY] = applyToPoint33(transform, [
       edge.to.x,
       edge.to.y
     ]);
@@ -2543,11 +2788,11 @@ function createSchematicTrace(trace, transform) {
   }
   for (const edge of edges) {
     if (!edge.is_crossing) continue;
-    const [screenFromX, screenFromY] = applyToPoint29(transform, [
+    const [screenFromX, screenFromY] = applyToPoint33(transform, [
       edge.from.x,
       edge.from.y
     ]);
-    const [screenToX, screenToY] = applyToPoint29(transform, [
+    const [screenToX, screenToY] = applyToPoint33(transform, [
       edge.to.x,
       edge.to.y
     ]);
@@ -2623,7 +2868,7 @@ function createSchematicTrace(trace, transform) {
   }
   if (trace.junctions) {
     for (const junction of trace.junctions) {
-      const [screenX, screenY] = applyToPoint29(transform, [
+      const [screenX, screenY] = applyToPoint33(transform, [
         junction.x,
         junction.y
       ]);
@@ -2658,7 +2903,7 @@ function createSchematicTrace(trace, transform) {
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-net-label.ts
 import {
-  applyToPoint as applyToPoint31,
+  applyToPoint as applyToPoint35,
   compose as compose8,
   rotate as rotate4,
   scale as scale5,
@@ -3446,7 +3691,7 @@ var estimateTextWidth = (text) => {
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-net-label-with-symbol.ts
 import {
-  applyToPoint as applyToPoint30,
+  applyToPoint as applyToPoint34,
   compose as compose7,
   rotate as rotate3,
   scale as scale4,
@@ -3566,7 +3811,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     x: symbolBounds.minX,
     y: (symbolBounds.minY + symbolBounds.maxY) / 2
   };
-  const rotatedSymbolEnd = applyToPoint30(rotationMatrix, symbolEndPoint);
+  const rotatedSymbolEnd = applyToPoint34(rotationMatrix, symbolEndPoint);
   const symbolToRealTransform = compose7(
     translate7(
       realAnchorPosition.x - rotatedSymbolEnd.x,
@@ -3576,11 +3821,11 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     scale4(1)
     // Use full symbol size
   );
-  const [screenMinX, screenMinY] = applyToPoint30(
+  const [screenMinX, screenMinY] = applyToPoint34(
     compose7(realToScreenTransform, symbolToRealTransform),
     [bounds.minX, bounds.minY]
   );
-  const [screenMaxX, screenMaxY] = applyToPoint30(
+  const [screenMaxX, screenMaxY] = applyToPoint34(
     compose7(realToScreenTransform, symbolToRealTransform),
     [bounds.maxX, bounds.maxY]
   );
@@ -3604,7 +3849,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
   });
   for (const path of symbolPaths) {
     const symbolPath = path.points.map((p, i) => {
-      const [x, y] = applyToPoint30(
+      const [x, y] = applyToPoint34(
         compose7(realToScreenTransform, symbolToRealTransform),
         [p.x, p.y]
       );
@@ -3624,7 +3869,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const text of symbolTexts) {
-    const screenTextPos = applyToPoint30(
+    const screenTextPos = applyToPoint34(
       compose7(realToScreenTransform, symbolToRealTransform),
       text
     );
@@ -3666,7 +3911,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const box of symbolBoxes) {
-    const screenBoxPos = applyToPoint30(
+    const screenBoxPos = applyToPoint34(
       compose7(realToScreenTransform, symbolToRealTransform),
       box
     );
@@ -3689,7 +3934,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const circle of symbolCircles) {
-    const screenCirclePos = applyToPoint30(
+    const screenCirclePos = applyToPoint34(
       compose7(realToScreenTransform, symbolToRealTransform),
       circle
     );
@@ -3728,14 +3973,14 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
   const fontSizePx = getSchScreenFontSize(realToScreenTransform, "net_label");
   const fontSizeMm = getSchMmFontSize("net_label");
   const textWidthFSR = estimateTextWidth(schNetLabel.text || "");
-  const screenCenter = applyToPoint31(realToScreenTransform, schNetLabel.center);
+  const screenCenter = applyToPoint35(realToScreenTransform, schNetLabel.center);
   const realTextGrowthVec = getUnitVectorFromOutsideToEdge(
     schNetLabel.anchor_side
   );
   const screenTextGrowthVec = { ...realTextGrowthVec };
   screenTextGrowthVec.y *= -1;
   const fullWidthFsr = textWidthFSR + ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_EXTRA_PER_CHARACTER_FSR * schNetLabel.text.length + END_PADDING_FSR;
-  const screenAnchorPosition = schNetLabel.anchor_position ? applyToPoint31(realToScreenTransform, schNetLabel.anchor_position) : {
+  const screenAnchorPosition = schNetLabel.anchor_position ? applyToPoint35(realToScreenTransform, schNetLabel.anchor_position) : {
     x: screenCenter.x - screenTextGrowthVec.x * fullWidthFsr * fontSizePx / 2,
     y: screenCenter.y - screenTextGrowthVec.y * fullWidthFsr * fontSizePx / 2
   };
@@ -3776,7 +4021,7 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
       y: -0.6
     }
   ].map(
-    (fontRelativePoint) => applyToPoint31(
+    (fontRelativePoint) => applyToPoint35(
       compose8(
         realToScreenTransform,
         translate8(realAnchorPosition.x, realAnchorPosition.y),