@tscircuit/core 0.0.147 → 0.0.149

package/dist/index.d.ts

@@ -115,24 +115,10 @@ type SchematicBoxPortPositionWithMetadata = {
     trueIndex: number;
     pinNumber: number;
     side: "left" | "right" | "top" | "bottom";
-    distanceFromEdge: number;
+    distanceFromOrthogonalEdge: number;
     x: number;
     y: number;
 };
-/**
- * Get the dimensions of a schematic box based on the provided parameters.
- *
- * A schematic box is a rectangular box with a set of pins on the sides.
- *
- * The user can customize the position of the pins and the spacing between them,
- * this makes computing the box fairly complicated.
- *
- * A note on the internals:
- * * A "true port" refers to a pin/port before it's remapped by the user to a
- *   different position. True Pin 1 is guaranteed to be in the top-left corner
- * * We basically iterate over each side and compute how far we are from the
- *   edge for that side by adding margins together
- */
 interface SchematicBoxDimensions {
     pinCount: number;
     getPortPositionByPinNumber(pinNumber: number): SchematicBoxPortPositionWithMetadata | null;

package/dist/index.js

@@ -1791,7 +1791,7 @@ var Port = class extends PrimitiveComponent {
       center: portCenter,
       source_port_id: this.source_port_id,
       facing_direction: this.facingDirection,
-      distance_from_component_edge: localPortInfo?.distanceFromEdge,
+      distance_from_component_edge: 0.4,
       side_of_component: localPortInfo?.side,
       pin_number: props.pinNumber,
       true_ccw_index: localPortInfo?.trueIndex
@@ -2072,7 +2072,7 @@ function isExplicitPinMappingArrangement(arrangement) {
   return arrangement.leftSide !== void 0;
 }
 var getAllDimensionsForSchematicBox = (params) => {
-  const componentMargin = params.schPinSpacing;
+  const portDistanceFromEdge = params.portDistanceFromEdge ?? 0.4;
   let sidePinCounts = params.schPortArrangement ? getSizeOfSidesFromPortArrangement(params.schPortArrangement) : null;
   const sideLengths = {
     left: 0,
@@ -2083,7 +2083,7 @@ var getAllDimensionsForSchematicBox = (params) => {
   let pinCount = params.pinCount ?? null;
   if (pinCount === null) {
     if (sidePinCounts) {
-      pinCount = sidePinCounts.leftSize + sidePinCounts.rightSize + sidePinCounts.topSize + sidePinCounts.bottomSize;
+      pinCount = sidePinCounts.leftSize + sidePinCounts.rightSize + sidePinCounts.topSize;
     } else {
       throw new Error("Could not determine pin count for the schematic box");
     }
@@ -2105,137 +2105,139 @@ var getAllDimensionsForSchematicBox = (params) => {
       bottomSize: 0
     };
   }
-  const schWidth = params.schWidth ?? Math.max(sidePinCounts.topSize, sidePinCounts.bottomSize) * params.schPinSpacing + 2 * componentMargin;
-  const schHeight = params.schHeight ?? Math.max(sidePinCounts.leftSize, sidePinCounts.rightSize) * params.schPinSpacing + 2 * componentMargin;
-  const distributePorts = (sideSize, sideLength, totalMargin) => {
-    if (sideSize <= 1) return 0;
-    return (sideLength - totalMargin) / (sideSize - 1);
-  };
   const orderedTruePorts = [];
+  let currentDistanceFromEdge = 0;
   let truePinIndex = 0;
-  const processSide = (side, pins, direction) => {
-    const isVertical = side === "left" || side === "right";
-    const sideLength = isVertical ? schHeight : schWidth;
-    let totalMargin = 0;
-    for (const pin of pins) {
-      const pinStyle = params.schPinStyle?.[`pin${pin}`] ?? params.schPinStyle?.[pin];
-      if (pinStyle) {
-        if (isVertical) {
-          totalMargin += (pinStyle.topMargin ?? 0) + (pinStyle.bottomMargin ?? 0);
-        } else {
-          totalMargin += (pinStyle.leftMargin ?? 0) + (pinStyle.rightMargin ?? 0);
-        }
-      }
+  for (let sideIndex = 0; sideIndex < sidePinCounts.leftSize; sideIndex++) {
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement?.leftSide?.pins[sideIndex] : truePinIndex + 1;
+    const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
+    if (pinStyle?.topMargin) {
+      currentDistanceFromEdge += pinStyle.topMargin;
+    }
+    orderedTruePorts.push({
+      trueIndex: truePinIndex,
+      pinNumber,
+      side: "left",
+      distanceFromOrthogonalEdge: currentDistanceFromEdge
+    });
+    if (pinStyle?.bottomMargin) {
+      currentDistanceFromEdge += pinStyle.bottomMargin;
     }
-    const spacing = distributePorts(
-      pins.length,
-      sideLength - 2 * componentMargin,
-      totalMargin
-    );
-    let currentDistanceFromEdge = componentMargin;
-    pins.forEach((pinNumber, index) => {
-      const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
-      if (pinStyle) {
-        if (isVertical) {
-          if (side === "left") {
-            currentDistanceFromEdge += direction === "top-to-bottom" ? pinStyle.topMargin ?? 0 : pinStyle.bottomMargin ?? 0;
-          } else {
-            currentDistanceFromEdge += direction === "top-to-bottom" ? pinStyle.bottomMargin ?? 0 : pinStyle.topMargin ?? 0;
-          }
-        } else {
-          if (side === "top") {
-            currentDistanceFromEdge += direction === "left-to-right" ? pinStyle.leftMargin ?? 0 : pinStyle.rightMargin ?? 0;
-          } else {
-            currentDistanceFromEdge += direction === "left-to-right" ? pinStyle.rightMargin ?? 0 : pinStyle.leftMargin ?? 0;
-          }
-        }
-      }
-      orderedTruePorts.push({
-        trueIndex: truePinIndex,
-        pinNumber,
-        side,
-        distanceFromEdge: currentDistanceFromEdge,
-        x: 0,
-        y: 0
-      });
-      if (pinStyle) {
-        if (isVertical) {
-          if (side === "left") {
-            currentDistanceFromEdge += direction === "top-to-bottom" ? pinStyle.bottomMargin ?? 0 : pinStyle.topMargin ?? 0;
-          } else {
-            currentDistanceFromEdge += direction === "top-to-bottom" ? pinStyle.topMargin ?? 0 : pinStyle.bottomMargin ?? 0;
-          }
-        } else {
-          if (side === "top") {
-            currentDistanceFromEdge += direction === "left-to-right" ? pinStyle.rightMargin ?? 0 : pinStyle.leftMargin ?? 0;
-          } else {
-            currentDistanceFromEdge += direction === "left-to-right" ? pinStyle.leftMargin ?? 0 : pinStyle.rightMargin ?? 0;
-          }
-        }
-      }
-      currentDistanceFromEdge += spacing;
-      truePinIndex++;
+    const isLastPinOnSide = sideIndex === sidePinCounts.leftSize - 1;
+    if (!isLastPinOnSide) {
+      currentDistanceFromEdge += params.schPinSpacing;
+    } else {
+      sideLengths.left = currentDistanceFromEdge;
+    }
+    truePinIndex++;
+  }
+  currentDistanceFromEdge = 0;
+  for (let sideIndex = 0; sideIndex < sidePinCounts.bottomSize; sideIndex++) {
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.bottomSide?.pins[sideIndex] : truePinIndex + 1;
+    const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
+    if (pinStyle?.leftMargin) {
+      currentDistanceFromEdge += pinStyle.leftMargin;
+    }
+    orderedTruePorts.push({
+      trueIndex: truePinIndex,
+      pinNumber,
+      side: "bottom",
+      distanceFromOrthogonalEdge: currentDistanceFromEdge
     });
-    sideLengths[side] = sideLength;
-  };
-  if (params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement)) {
-    if (params.schPortArrangement.leftSide) {
-      processSide(
-        "left",
-        params.schPortArrangement.leftSide.pins,
-        params.schPortArrangement.leftSide.direction ?? "top-to-bottom"
-      );
+    if (pinStyle?.rightMargin) {
+      currentDistanceFromEdge += pinStyle.rightMargin;
     }
-    if (params.schPortArrangement.rightSide) {
-      processSide(
-        "right",
-        params.schPortArrangement.rightSide.pins,
-        params.schPortArrangement.rightSide.direction ?? "bottom-to-top"
-      );
+    const isLastPinOnSide = sideIndex === sidePinCounts.bottomSize - 1;
+    if (!isLastPinOnSide) {
+      currentDistanceFromEdge += params.schPinSpacing;
+    } else {
+      sideLengths.bottom = currentDistanceFromEdge;
+    }
+    truePinIndex++;
+  }
+  currentDistanceFromEdge = 0;
+  for (let sideIndex = 0; sideIndex < sidePinCounts.rightSize; sideIndex++) {
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.rightSide?.pins[sideIndex] : truePinIndex + 1;
+    const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
+    if (pinStyle?.bottomMargin) {
+      currentDistanceFromEdge += pinStyle.bottomMargin;
+    }
+    orderedTruePorts.push({
+      trueIndex: truePinIndex,
+      pinNumber,
+      side: "right",
+      distanceFromOrthogonalEdge: currentDistanceFromEdge
+    });
+    if (pinStyle?.topMargin) {
+      currentDistanceFromEdge += pinStyle.topMargin;
     }
-    if (params.schPortArrangement.topSide) {
-      processSide(
-        "top",
-        params.schPortArrangement.topSide.pins,
-        params.schPortArrangement.topSide.direction ?? "left-to-right"
-      );
+    const isLastPinOnSide = sideIndex === sidePinCounts.rightSize - 1;
+    if (!isLastPinOnSide) {
+      currentDistanceFromEdge += params.schPinSpacing;
+    } else {
+      sideLengths.right = currentDistanceFromEdge;
+    }
+    truePinIndex++;
+  }
+  currentDistanceFromEdge = 0;
+  for (let sideIndex = 0; sideIndex < sidePinCounts.topSize; sideIndex++) {
+    const pinNumber = params.schPortArrangement && isExplicitPinMappingArrangement(params.schPortArrangement) ? params.schPortArrangement.topSide?.pins[sideIndex] : truePinIndex + 1;
+    const pinStyle = params.schPinStyle?.[`pin${pinNumber}`] ?? params.schPinStyle?.[pinNumber];
+    if (pinStyle?.rightMargin) {
+      currentDistanceFromEdge += pinStyle.rightMargin;
+    }
+    orderedTruePorts.push({
+      trueIndex: truePinIndex,
+      pinNumber,
+      side: "top",
+      distanceFromOrthogonalEdge: currentDistanceFromEdge
+    });
+    if (pinStyle?.leftMargin) {
+      currentDistanceFromEdge += pinStyle.leftMargin;
     }
-    if (params.schPortArrangement.bottomSide) {
-      processSide(
-        "bottom",
-        params.schPortArrangement.bottomSide.pins,
-        params.schPortArrangement.bottomSide.direction ?? "left-to-right"
-      );
+    const isLastPinOnSide = sideIndex === sidePinCounts.topSize - 1;
+    if (!isLastPinOnSide) {
+      currentDistanceFromEdge += params.schPinSpacing;
+    } else {
+      sideLengths.top = currentDistanceFromEdge;
     }
-  } else {
-    const leftSide = Array.from(
-      { length: sidePinCounts.leftSize },
-      (_, i) => i + 1
-    );
-    const rightSide = Array.from(
-      { length: sidePinCounts.rightSize },
-      (_, i) => i + sidePinCounts.leftSize + 1
-    );
-    const topSide = Array.from(
-      { length: sidePinCounts.topSize },
-      (_, i) => i + sidePinCounts.leftSize + sidePinCounts.rightSize + 1
+    truePinIndex++;
+  }
+  let schWidth = params.schWidth;
+  if (!schWidth) {
+    schWidth = Math.max(
+      sideLengths.top + params.schPinSpacing * 2,
+      sideLengths.bottom + params.schPinSpacing * 2
     );
-    const bottomSide = Array.from(
-      {
-        length: pinCount - sidePinCounts.leftSize - sidePinCounts.rightSize - sidePinCounts.topSize
-      },
-      (_, i) => i + sidePinCounts.leftSize + sidePinCounts.rightSize + sidePinCounts.topSize + 1
+  }
+  let schHeight = params.schHeight;
+  if (!schHeight) {
+    schHeight = Math.max(
+      sideLengths.left + params.schPinSpacing * 2,
+      sideLengths.right + params.schPinSpacing * 2
     );
-    processSide("left", leftSide, "top-to-bottom");
-    processSide("right", rightSide, "top-to-bottom");
-    processSide("top", topSide, "left-to-right");
-    processSide("bottom", bottomSide, "left-to-right");
   }
   const trueEdgePositions = {
-    left: { x: -schWidth / 2 - 0.2, y: schHeight / 2 },
-    bottom: { x: -schWidth / 2, y: schHeight / 2 + 0.2 },
-    right: { x: schWidth / 2 + 0.2, y: -schHeight / 2 },
-    top: { x: schWidth / 2, y: -schHeight / 2 - 0.2 }
+    // Top left corner
+    left: {
+      x: -schWidth / 2 - portDistanceFromEdge,
+      y: sideLengths.left / 2
+    },
+    // bottom left corner
+    bottom: {
+      x: -sideLengths.bottom / 2,
+      y: -schHeight / 2 - portDistanceFromEdge
+    },
+    // bottom right corner
+    right: {
+      x: schWidth / 2 + portDistanceFromEdge,
+      y: -sideLengths.right / 2
+    },
+    // top right corner
+    top: {
+      x: sideLengths.top / 2,
+      y: schHeight / 2 + portDistanceFromEdge
+    }
   };
   const trueEdgeTraversalDirections = {
     left: { x: 0, y: -1 },
@@ -2244,13 +2246,13 @@ var getAllDimensionsForSchematicBox = (params) => {
     bottom: { x: 1, y: 0 }
   };
   const truePortsWithPositions = orderedTruePorts.map((p) => {
-    const { distanceFromEdge, side } = p;
+    const { distanceFromOrthogonalEdge, side } = p;
     const edgePos = trueEdgePositions[side];
     const edgeDir = trueEdgeTraversalDirections[side];
     return {
-      ...p,
-      x: edgePos.x + distanceFromEdge * edgeDir.x,
-      y: edgePos.y + distanceFromEdge * edgeDir.y
+      x: edgePos.x + distanceFromOrthogonalEdge * edgeDir.x,
+      y: edgePos.y + distanceFromOrthogonalEdge * edgeDir.y,
+      ...p
     };
   });
   return {
@@ -3300,38 +3302,6 @@ function getClosest(point, candidates) {
   return closest;
 }
 
-// lib/utils/projectPointInDirection.ts
-var projectPointInDirection = (point, direction, distance) => {
-  switch (direction) {
-    case "up":
-      return { x: point.x, y: point.y + distance };
-    case "down":
-      return { x: point.x, y: point.y - distance };
-    case "left":
-      return { x: point.x + distance, y: point.y };
-    case "right":
-      return { x: point.x - distance, y: point.y };
-    default:
-      throw new Error(`Unknown direction "${direction}"`);
-  }
-};
-
-// lib/utils/projectPointInOppositeDirection.ts
-var projectPointInOppositeDirection = (point, direction, distance) => {
-  switch (direction) {
-    case "up":
-      return { x: point.x, y: point.y + distance };
-    case "down":
-      return { x: point.x, y: point.y - distance };
-    case "left":
-      return { x: point.x + distance, y: point.y };
-    case "right":
-      return { x: point.x - distance, y: point.y };
-    default:
-      throw new Error(`Unknown direction "${direction}"`);
-  }
-};
-
 // lib/utils/try-now.ts
 function tryNow(fn) {
   try {
@@ -3343,6 +3313,56 @@ function tryNow(fn) {
 
 // lib/components/primitive-components/Trace.ts
 import "zod";
+
+// lib/utils/autorouting/getDominantDirection.ts
+function getDominantDirection(edge) {
+  const delta = {
+    x: edge.to.x - edge.from.x,
+    y: edge.to.y - edge.from.y
+  };
+  const absX = Math.abs(delta.x);
+  const absY = Math.abs(delta.y);
+  if (absX > absY) {
+    return delta.x > 0 ? "right" : "left";
+  }
+  return delta.y > 0 ? "down" : "up";
+}
+
+// lib/utils/schematic/getStubEdges.ts
+var getStubEdges = ({
+  lastEdge,
+  lastEdgePort,
+  lastDominantDirection
+}) => {
+  const edges = [];
+  if (lastEdge && lastEdgePort) {
+    const intermediatePoint = { x: lastEdge.to.x, y: lastEdge.to.y };
+    if (lastDominantDirection === "left" || lastDominantDirection === "right") {
+      intermediatePoint.x = lastEdgePort.position.x;
+      edges.push({
+        from: lastEdge.to,
+        to: { ...intermediatePoint }
+      });
+      edges.push({
+        from: intermediatePoint,
+        to: { ...lastEdgePort.position }
+      });
+    } else {
+      intermediatePoint.y = lastEdgePort.position.y;
+      edges.push({
+        from: lastEdge.to,
+        to: { ...intermediatePoint }
+      });
+      edges.push({
+        from: intermediatePoint,
+        to: { ...lastEdgePort.position }
+      });
+    }
+  }
+  return edges;
+};
+
+// lib/components/primitive-components/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -3750,7 +3770,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const { db } = this.root;
     const { _parsedProps: props, parent } = this;
     if (!parent) throw new Error("Trace has no parent");
-    const { allPortsFound, portsWithSelectors: ports } = this._findConnectedPorts();
+    const { allPortsFound, portsWithSelectors: connectedPorts } = this._findConnectedPorts();
     if (!allPortsFound) return;
     const obstacles = [];
     const connection = {
@@ -3779,7 +3799,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         });
       }
     }
-    const portsWithPosition = ports.map(({ port }) => ({
+    const portsWithPosition = connectedPorts.map(({ port }) => ({
       port,
       position: port._getGlobalSchematicPositionAfterLayout(),
       schematic_port_id: port.schematic_port_id ?? void 0,
@@ -3811,8 +3831,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     });
     const results = autorouter.solveAndMapToTraces();
     if (results.length === 0) return;
-    const [result] = results;
-    const { route } = result;
+    const [{ route }] = results;
     const edges = [];
     for (let i = 0; i < route.length - 1; i++) {
       edges.push({
@@ -3820,29 +3839,12 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         to: route[i + 1]
       });
     }
-    const STUB_LENGTH = 0.15;
-    edges.unshift({
-      from: {
-        ...projectPointInDirection(
-          route[0],
-          portsWithPosition[0].facingDirection,
-          STUB_LENGTH
-        )
-      },
-      to: route[0],
-      from_schematic_port_id: portsWithPosition[0].schematic_port_id
-    });
-    edges.push({
-      from: route[route.length - 1],
-      to: {
-        ...projectPointInOppositeDirection(
-          route[route.length - 1],
-          portsWithPosition[1].facingDirection,
-          STUB_LENGTH
-        )
-      },
-      from_schematic_port_id: portsWithPosition[1].schematic_port_id
-    });
+    const lastEdge = edges[edges.length - 1];
+    const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
+    const lastDominantDirection = getDominantDirection(lastEdge);
+    edges.push(
+      ...getStubEdges({ lastEdge, lastEdgePort, lastDominantDirection })
+    );
     const trace = db.schematic_trace.insert({
       source_trace_id: this.source_trace_id,
       edges

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.147",
+  "version": "0.0.149",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,7 +45,7 @@
     "@tscircuit/soup-util": "^0.0.33",
     "circuit-json": "^0.0.93",
     "circuit-json-to-connectivity-map": "^0.0.17",
-    "circuit-to-svg": "^0.0.57",
+    "circuit-to-svg": "^0.0.58",
     "nanoid": "^5.0.7",
     "performance-now": "^2.1.0",
     "react": "^18.3.1",