@tscircuit/core 0.0.132 → 0.0.133

package/dist/index.js

@@ -1543,9 +1543,10 @@ var Port = class extends PrimitiveComponent {
       console.warn(`Could not find parent symbol for ${this}`);
       return { x: 0, y: 0 };
     }
+    const offsetY = -0.045;
     const transform = compose3(
       this.parent.computeSchematicGlobalTransform(),
-      translate3(-symbol.center.x, -symbol.center.y)
+      translate3(-symbol.center.x, -symbol.center.y + offsetY)
     );
     return applyToPoint4(transform, this.schematicSymbolPortDef);
   }
@@ -2554,11 +2555,49 @@ var stringProxy = new Proxy(
 var FTYPE = stringProxy;
 
 // lib/components/primitive-components/Trace.ts
-import { traceProps } from "@tscircuit/props";
 import {
   MultilayerIjump,
   getObstaclesFromSoup
 } from "@tscircuit/infgrid-ijump-astar";
+import { traceProps } from "@tscircuit/props";
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
+
+// lib/utils/autorouting/DirectLineRouter.ts
+var DirectLineRouter = class {
+  input;
+  constructor({ input }) {
+    this.input = input;
+  }
+  solveAndMapToTraces() {
+    const traces = [];
+    for (const connection of this.input.connections) {
+      if (connection.pointsToConnect.length !== 2) continue;
+      const [start, end] = connection.pointsToConnect;
+      const trace = {
+        type: "pcb_trace",
+        pcb_trace_id: "",
+        route: [
+          {
+            route_type: "wire",
+            x: start.x,
+            y: start.y,
+            layer: "top",
+            width: 0.1
+          },
+          {
+            route_type: "wire",
+            x: end.x,
+            y: end.y,
+            layer: "top",
+            width: 0.1
+          }
+        ]
+      };
+      traces.push(trace);
+    }
+    return traces;
+  }
+};
 
 // lib/utils/autorouting/computeObstacleBounds.ts
 var computeObstacleBounds = (obstacles) => {
@@ -2569,22 +2608,6 @@ var computeObstacleBounds = (obstacles) => {
   return { minX, maxX, minY, maxY };
 };
 
-// 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/autorouting/findPossibleTraceLayerCombinations.ts
 var LAYER_SELECTION_PREFERENCE = ["top", "bottom", "inner1", "inner2"];
 var findPossibleTraceLayerCombinations = (hints, layer_path = []) => {
@@ -2718,8 +2741,37 @@ function getClosest(point, candidates) {
   return closest;
 }
 
-// lib/components/primitive-components/Trace.ts
-import "zod";
+// 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) {
@@ -2731,46 +2783,7 @@ function tryNow(fn) {
 }
 
 // lib/components/primitive-components/Trace.ts
-import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
-
-// lib/utils/autorouting/DirectLineRouter.ts
-var DirectLineRouter = class {
-  input;
-  constructor({ input }) {
-    this.input = input;
-  }
-  solveAndMapToTraces() {
-    const traces = [];
-    for (const connection of this.input.connections) {
-      if (connection.pointsToConnect.length !== 2) continue;
-      const [start, end] = connection.pointsToConnect;
-      const trace = {
-        type: "pcb_trace",
-        pcb_trace_id: "",
-        route: [
-          {
-            route_type: "wire",
-            x: start.x,
-            y: start.y,
-            layer: "top",
-            width: 0.1
-          },
-          {
-            route_type: "wire",
-            x: end.x,
-            y: end.y,
-            layer: "top",
-            width: 0.1
-          }
-        ]
-      };
-      traces.push(trace);
-    }
-    return traces;
-  }
-};
-
-// lib/components/primitive-components/Trace.ts
+import "zod";
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -3204,17 +3217,19 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         });
       }
     }
-    for (const { port } of ports) {
-      connection.pointsToConnect.push({
-        ...port._getGlobalSchematicPositionAfterLayout(),
-        ...projectPointInDirection(
-          port._getGlobalSchematicPositionAfterLayout(),
-          port.facingDirection,
-          0.1501
-        ),
-        layer: "top"
-      });
+    const portsWithPosition = ports.map(({ port }) => ({
+      port,
+      position: port._getGlobalSchematicPositionAfterLayout(),
+      schematic_port_id: port.schematic_port_id ?? void 0,
+      facingDirection: port.facingDirection
+    }));
+    if (portsWithPosition.length < 2) {
+      return;
     }
+    connection.pointsToConnect = portsWithPosition.map(({ position }) => ({
+      ...position,
+      layer: "top"
+    }));
     const bounds = computeObstacleBounds(obstacles);
     const simpleRouteJsonInput = {
       minTraceWidth: 0.1,
@@ -3223,19 +3238,6 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       bounds,
       layerCount: 1
     };
-    if (this.getSubcircuit().props._schDebugObjectsEnabled) {
-      for (const obstacle of obstacles) {
-        db.schematic_debug_object.insert({
-          shape: "rect",
-          center: obstacle.center,
-          size: {
-            width: obstacle.width,
-            height: obstacle.height
-          },
-          label: "obstacle"
-        });
-      }
-    }
     let Autorouter = MultilayerIjump;
     if (this.getSubcircuit().props._schDirectLineRoutingEnabled) {
       Autorouter = DirectLineRouter;
@@ -3250,14 +3252,34 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const { route } = result;
     const edges = [];
     for (let i = 0; i < route.length - 1; i++) {
-      const from = route[i];
-      const to = route[i + 1];
       edges.push({
-        from,
-        to
-        // TODO to_schematic_port_id and from_schematic_port_id
+        from: route[i],
+        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 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.132",
+  "version": "0.0.133",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",