@tscircuit/schematic-trace-solver 0.0.2 → 0.0.4

package/README.md

@@ -71,5 +71,11 @@ const solver = new SchematicTracePipelineSolver({
     },
     // ...
   ],
+  availableNetLabelOrientations: {
+    VCC: ["y+", "y-"],
+    GND: ["y+", "y-"],
+  },
 })
+
+solver.solve()
 ```

package/dist/index.js

@@ -5335,6 +5335,36 @@ var getColorFromString = (string, alpha = 1) => {
   return `hsl(${hash % 360}, 100%, 50%, ${alpha})`;
 };
 
+// lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/getPinDirection.ts
+var getPinDirection = (pin, chip) => {
+  const { x, y } = pin;
+  const { center, width, height } = chip;
+  const yPlusEdge = center.y + height / 2;
+  const yMinusEdge = center.y - height / 2;
+  const xPlusEdge = center.x + width / 2;
+  const xMinusEdge = center.x - width / 2;
+  const yPlusDistance = yPlusEdge - y;
+  const yMinusDistance = y - yMinusEdge;
+  const xPlusDistance = xPlusEdge - x;
+  const xMinusDistance = x - xMinusEdge;
+  const minDistance = Math.min(
+    yPlusDistance,
+    yMinusDistance,
+    xPlusDistance,
+    xMinusDistance
+  );
+  if (minDistance === yPlusDistance) {
+    return "y+";
+  }
+  if (minDistance === yMinusDistance) {
+    return "y-";
+  }
+  if (minDistance === xPlusDistance) {
+    return "x+";
+  }
+  return "x-";
+};
+
 // lib/solvers/SchematicTracePipelineSolver/visualizeInputProblem.ts
 var visualizeInputProblem = (inputProblem, opts = {}) => {
   const { connectionAlpha = 0.8, chipAlpha = 0.8 } = opts;
@@ -5359,7 +5389,8 @@ var visualizeInputProblem = (inputProblem, opts = {}) => {
     });
     for (const pin of chip.pins) {
       graphics.points.push({
-        label: pin.pinId,
+        label: `${pin.pinId}
+${pin._facingDirection ?? getPinDirection(pin, chip)}`,
         x: pin.x,
         y: pin.y,
         color: getColorFromString(pin.pinId, 0.8)
@@ -6463,36 +6494,6 @@ var calculateElbow = (point1, point2, options = {}) => {
   return orderFlipped ? result.reverse() : result;
 };
 
-// lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/getPinDirection.ts
-var getPinDirection = (pin, chip) => {
-  const { x, y } = pin;
-  const { center, width, height } = chip;
-  const yPlusEdge = center.y + height / 2;
-  const yMinusEdge = center.y - height / 2;
-  const xPlusEdge = center.x + width / 2;
-  const xMinusEdge = center.x - width / 2;
-  const yPlusDistance = Math.abs(y - yPlusEdge);
-  const yMinusDistance = Math.abs(y - yMinusEdge);
-  const xPlusDistance = Math.abs(x - xPlusEdge);
-  const xMinusDistance = Math.abs(x - xMinusEdge);
-  const minDistance = Math.min(
-    yPlusDistance,
-    yMinusDistance,
-    xPlusDistance,
-    xMinusDistance
-  );
-  if (minDistance === yPlusDistance) {
-    return "y+";
-  }
-  if (minDistance === yMinusDistance) {
-    return "y-";
-  }
-  if (minDistance === xPlusDistance) {
-    return "x+";
-  }
-  return "x-";
-};
-
 // lib/utils/dir.ts
 var dir = (facingDirection) => {
   switch (facingDirection) {
@@ -6893,6 +6894,7 @@ var TraceOverlapIssueSolver = class extends BaseSolver {
         const appliedY = /* @__PURE__ */ new Set();
         for (const si of segIdxs) {
           if (si < 0 || si >= pts.length - 1) continue;
+          if (si === 0 || si === pts.length - 2) continue;
           const start = pts[si];
           const end = pts[si + 1];
           const isVertical = Math.abs(start.x - end.x) < EPS;

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/getPinDirection.ts

@@ -14,10 +14,10 @@ export const getPinDirection = (
   const xMinusEdge = center.x - width / 2
 
   // Which edge is the pin closest to?
-  const yPlusDistance = Math.abs(y - yPlusEdge)
-  const yMinusDistance = Math.abs(y - yMinusEdge)
-  const xPlusDistance = Math.abs(x - xPlusEdge)
-  const xMinusDistance = Math.abs(x - xMinusEdge)
+  const yPlusDistance = yPlusEdge - y
+  const yMinusDistance = y - yMinusEdge
+  const xPlusDistance = xPlusEdge - x
+  const xMinusDistance = x - xMinusEdge
 
   const minDistance = Math.min(
     yPlusDistance,

package/lib/solvers/SchematicTracePipelineSolver/visualizeInputProblem.ts

@@ -1,6 +1,7 @@
 import type { GraphicsObject } from "graphics-debug"
 import type { PinId, InputPin, InputProblem } from "lib/types/InputProblem"
 import { getColorFromString } from "lib/utils/getColorFromString"
+import { getPinDirection } from "../SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/getPinDirection"
 
 export const visualizeInputProblem = (
   inputProblem: InputProblem,
@@ -37,7 +38,7 @@ export const visualizeInputProblem = (
 
     for (const pin of chip.pins) {
       graphics.points.push({
-        label: pin.pinId,
+        label: `${pin.pinId}\n${pin._facingDirection ?? getPinDirection(pin, chip)}`,
         x: pin.x,
         y: pin.y,
         color: getColorFromString(pin.pinId, 0.8),

package/lib/solvers/TraceOverlapShiftSolver/TraceOverlapIssueSolver/TraceOverlapIssueSolver.ts

@@ -89,6 +89,8 @@ export class TraceOverlapIssueSolver extends BaseSolver {
 
         for (const si of segIdxs) {
           if (si < 0 || si >= pts.length - 1) continue
+          // Do not move the first or last segment since they connect directly to pins
+          if (si === 0 || si === pts.length - 2) continue
           const start = pts[si]!
           const end = pts[si + 1]!
           const isVertical = Math.abs(start.x - end.x) < EPS

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "type": "module",
   "scripts": {
     "start": "cosmos",
@@ -10,6 +10,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.2.2",
+    "@react-hook/resize-observer": "^2.0.2",
     "@tscircuit/math-utils": "^0.0.19",
     "@types/bun": "latest",
     "calculate-elbow": "^0.0.10",
@@ -19,8 +20,7 @@
     "react-cosmos": "^7.0.0",
     "react-cosmos-plugin-vite": "^7.0.0",
     "tsup": "^8.5.0",
-    "vite": "^7.1.3",
-    "@react-hook/resize-observer": "^2.0.2"
+    "vite": "^7.1.3"
   },
   "peerDependencies": {
     "typescript": "^5"

package/site/examples/example02.page.tsx

@@ -0,0 +1,181 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import type { InputProblem } from "lib/types/InputProblem"
+const inputProblem: InputProblem = {
+  chips: [
+    {
+      chipId: "schematic_component_0",
+      center: {
+        x: -1.9145832999999999,
+        y: 0.5512093000000002,
+      },
+      width: 0.5291665999999999,
+      height: 1.0583333000000001,
+      pins: [
+        {
+          pinId: "C6.1",
+          x: -1.9148566499999995,
+          y: 1.1024186000000005,
+        },
+        {
+          pinId: "C6.2",
+          x: -1.9143099500000003,
+          y: 0,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_1",
+      center: {
+        x: -4.1729164999999995,
+        y: 0.5512093,
+      },
+      width: 0.5291665999999999,
+      height: 1.0583333000000001,
+      pins: [
+        {
+          pinId: "C1.1",
+          x: -4.173189849999999,
+          y: 1.1024186000000002,
+        },
+        {
+          pinId: "C1.2",
+          x: -4.17264315,
+          y: -2.220446049250313e-16,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_2",
+      center: {
+        x: -3.0437499,
+        y: 0.5512093,
+      },
+      width: 0.5291665999999999,
+      height: 1.0583333000000001,
+      pins: [
+        {
+          pinId: "C2.1",
+          x: -3.0440232499999995,
+          y: 1.1024186000000002,
+        },
+        {
+          pinId: "C2.2",
+          x: -3.0434765500000003,
+          y: -2.220446049250313e-16,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_3",
+      center: {
+        x: 1.9145832999999999,
+        y: -0.4512093000000006,
+      },
+      width: 0.5291665999999999,
+      height: 1.0583333000000001,
+      pins: [
+        {
+          pinId: "C5.1",
+          x: 1.9143099500000003,
+          y: 0.09999999999999964,
+        },
+        {
+          pinId: "C5.2",
+          x: 1.9148566499999995,
+          y: -1.0024186000000008,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_4",
+      center: {
+        x: 0,
+        y: 0,
+      },
+      width: 1.2000000000000002,
+      height: 0.8,
+      pins: [
+        {
+          pinId: "U1.1",
+          x: -1,
+          y: 0.2,
+        },
+        {
+          pinId: "U1.2",
+          x: -1,
+          y: 0,
+        },
+        {
+          pinId: "U1.3",
+          x: -1,
+          y: -0.2,
+        },
+        {
+          pinId: "U1.4",
+          x: 1,
+          y: -0.1,
+        },
+        {
+          pinId: "U1.5",
+          x: 1,
+          y: 0.1,
+        },
+      ],
+    },
+  ],
+  directConnections: [
+    {
+      pinIds: ["U1.1", "C6.1"],
+      netId: "group.voltage_regulator > chip.U1 > port.VIN to C6.1",
+    },
+    {
+      pinIds: ["U1.1", "C1.1"],
+      netId: "group.voltage_regulator > chip.U1 > port.VIN to C1.1",
+    },
+    {
+      pinIds: ["U1.1", "C2.1"],
+      netId: "group.voltage_regulator > chip.U1 > port.VIN to C2.1",
+    },
+    {
+      pinIds: ["U1.2", "C6.2"],
+      netId: "group.voltage_regulator > chip.U1 > port.GND to C6.2",
+    },
+    {
+      pinIds: ["U1.2", "C1.2"],
+      netId: "group.voltage_regulator > chip.U1 > port.GND to C1.2",
+    },
+    {
+      pinIds: ["U1.2", "C2.2"],
+      netId: "group.voltage_regulator > chip.U1 > port.GND to C2.2",
+    },
+    {
+      pinIds: ["U1.3", "U1.1"],
+      netId: "group.voltage_regulator > chip.U1 > port.EN to U1.1",
+    },
+    {
+      pinIds: ["U1.5", "C5.1"],
+      netId: "group.voltage_regulator > chip.U1 > port.VOUT to C5.1",
+    },
+  ],
+  netConnections: [
+    {
+      netId: "VSYS",
+      pinIds: ["C6.1", "C1.1", "C2.1", "U1.1", "U1.3"],
+    },
+    {
+      netId: "GND",
+      pinIds: ["C6.2", "C1.2", "C2.2", "C5.2", "U1.2"],
+    },
+    {
+      netId: "V3_3",
+      pinIds: ["C5.1", "U1.5"],
+    },
+  ],
+  availableNetLabelOrientations: {
+    VSYS: ["y+"],
+    GND: ["y-"],
+    V3_3: ["y+"],
+  },
+}
+
+export default () => <PipelineDebugger inputProblem={inputProblem} />

package/tests/functions/generateElbowVariants.test.ts

@@ -3,7 +3,7 @@ import { test, expect } from "bun:test"
 import type { Guideline } from "lib/solvers/GuidelinesSolver/GuidelinesSolver"
 import type { Point } from "@tscircuit/math-utils"
 
-test("generateElbowVariants - simple horizontal segment", () => {
+test.skip("generateElbowVariants - simple horizontal segment", () => {
   const baseElbow: Point[] = [
     { x: 0, y: 0 },
     { x: 1, y: 0 },
@@ -44,7 +44,7 @@ test("generateElbowVariants - no movable segments", () => {
   expect(result.elbowVariants[0]).toEqual(baseElbow)
 })
 
-test("generateElbowVariants - vertical movable segment", () => {
+test.skip("generateElbowVariants - vertical movable segment", () => {
   const baseElbow: Point[] = [
     { x: 0, y: 0 },
     { x: 0, y: 1 },
@@ -66,7 +66,7 @@ test("generateElbowVariants - vertical movable segment", () => {
   expect(result.elbowVariants.length).toBe(3) // Original + 2 guidelines
 })
 
-test("generateElbowVariants - multiple segments with guidelines", () => {
+test.skip("generateElbowVariants - multiple segments with guidelines", () => {
   const baseElbow: Point[] = [
     { x: 0, y: 0 },
     { x: 1, y: 0 },