@tscircuit/core 0.0.256 → 0.0.257

package/dist/index.js

@@ -44,7 +44,7 @@ __export(components_exports, {
   SilkscreenText: () => SilkscreenText,
   SmtPad: () => SmtPad,
   Subcircuit: () => Subcircuit,
-  Trace: () => Trace,
+  Trace: () => Trace2,
   TraceHint: () => TraceHint,
   Transistor: () => Transistor,
   Via: () => Via
@@ -4475,6 +4475,75 @@ function getTraceDisplayName({
   return void 0;
 }
 
+// lib/components/primitive-components/Trace/get-obstacles-for-trace.ts
+import "@tscircuit/math-utils";
+var getSchematicObstaclesForTrace = (trace) => {
+  const db = trace.root.db;
+  const obstacles = [];
+  for (const elm of db.toArray()) {
+    if (elm.type === "schematic_component") {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.center,
+        width: elm.size.width,
+        height: elm.size.height,
+        connectedTo: []
+      });
+    }
+    if (elm.type === "schematic_port") {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.center,
+        width: 0.1,
+        height: 0.1,
+        connectedTo: []
+      });
+    }
+    if (elm.type === "schematic_text") {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.position,
+        width: (elm.text?.length ?? 0) * 0.1,
+        height: 0.2,
+        connectedTo: []
+      });
+    }
+    if (elm.type === "schematic_box") {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: { x: elm.x, y: elm.y },
+        width: elm.width,
+        height: elm.height,
+        connectedTo: []
+      });
+    }
+    if (elm.type === "schematic_net_label" && elm.symbol_name) {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.center,
+        width: 0.25,
+        height: 0.6,
+        connectedTo: []
+      });
+    } else if (elm.type === "schematic_net_label") {
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.center,
+        width: (elm.text?.length ?? 0) * 0.1,
+        height: 0.2,
+        connectedTo: []
+      });
+    }
+  }
+  return obstacles;
+};
+
 // lib/components/primitive-components/Trace/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
@@ -4484,7 +4553,7 @@ var portToObjective = (port) => {
   };
 };
 var SHOULD_USE_SINGLE_LAYER_ROUTING = false;
-var Trace = class extends PrimitiveComponent {
+var Trace2 = class extends PrimitiveComponent {
   source_trace_id = null;
   pcb_trace_id = null;
   schematic_trace_id = null;
@@ -5000,76 +5069,15 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const { allPortsFound, portsWithSelectors: connectedPorts } = this._findConnectedPorts();
     const { netsWithSelectors } = this._findConnectedNets();
     if (!allPortsFound) return;
-    const obstacles = [];
-    const connection = {
-      name: this.source_trace_id,
-      pointsToConnect: []
-    };
     if (this.props.schDisplayLabel && ("from" in this.props && "to" in this.props || "path" in this.props)) {
       this._doInitialSchematicTraceRenderWithDisplayLabel();
       return;
     }
-    for (const elm of db.toArray()) {
-      if (elm.type === "schematic_component") {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: elm.center,
-          width: elm.size.width,
-          height: elm.size.height,
-          connectedTo: []
-        });
-      }
-      if (elm.type === "schematic_port") {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: elm.center,
-          width: 0.1,
-          height: 0.1,
-          connectedTo: []
-        });
-      }
-      if (elm.type === "schematic_text") {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: elm.position,
-          width: (elm.text?.length ?? 0) * 0.1,
-          height: 0.2,
-          connectedTo: []
-        });
-      }
-      if (elm.type === "schematic_box") {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: { x: elm.x, y: elm.y },
-          width: elm.width,
-          height: elm.width,
-          connectedTo: []
-        });
-      }
-      if (elm.type === "schematic_net_label" && elm.symbol_name) {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: elm.center,
-          width: 0.25,
-          height: 0.6,
-          connectedTo: []
-        });
-      } else if (elm.type === "schematic_net_label") {
-        obstacles.push({
-          type: "rect",
-          layers: ["top"],
-          center: elm.center,
-          width: (elm.text?.length ?? 0) * 0.1,
-          height: 0.2,
-          connectedTo: []
-        });
-      }
-    }
+    const connection = {
+      name: this.source_trace_id,
+      pointsToConnect: []
+    };
+    const obstacles = getSchematicObstaclesForTrace(this);
     const portsWithPosition = connectedPorts.map(({ port }) => ({
       port,
       position: port._getGlobalSchematicPositionAfterLayout(),
@@ -5098,11 +5106,17 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       layer: "top"
     }));
     const bounds = computeObstacleBounds(obstacles);
+    const BOUNDS_MARGIN = 1;
     const simpleRouteJsonInput = {
       minTraceWidth: 0.1,
       obstacles,
       connections: [connection],
-      bounds,
+      bounds: {
+        minX: bounds.minX - BOUNDS_MARGIN,
+        maxX: bounds.maxX + BOUNDS_MARGIN,
+        minY: bounds.minY - BOUNDS_MARGIN,
+        maxY: bounds.maxY + BOUNDS_MARGIN
+      },
       layerCount: 1
     };
     let Autorouter = MultilayerIjump;
@@ -5112,7 +5126,8 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const autorouter = new Autorouter({
       input: simpleRouteJsonInput,
       OBSTACLE_MARGIN: 0.1,
-      isRemovePathLoopsEnabled: true
+      isRemovePathLoopsEnabled: true,
+      isShortenPathWithShortcutsEnabled: false
     });
     const results = autorouter.solveAndMapToTraces();
     if (results.length === 0) return;
@@ -5197,13 +5212,13 @@ var Capacitor = class extends NormalComponent {
   doInitialCreateTracesFromProps() {
     if (this.props.decouplingFor && this.props.decouplingTo) {
       this.add(
-        new Trace({
+        new Trace2({
           from: `${this.getSubcircuitSelector()} > port.1`,
           to: this.props.decouplingFor
         })
       );
       this.add(
-        new Trace({
+        new Trace2({
           from: `${this.getSubcircuitSelector()} > port.2`,
           to: this.props.decouplingTo
         })
@@ -5421,13 +5436,13 @@ var Resistor = class extends NormalComponent {
   doInitialCreateTracesFromProps() {
     if (this.props.pullupFor && this.props.pullupTo) {
       this.add(
-        new Trace({
+        new Trace2({
           from: `${this.getSubcircuitSelector()} > port.1`,
           to: this.props.pullupFor
         })
       );
       this.add(
-        new Trace({
+        new Trace2({
           from: `${this.getSubcircuitSelector()} > port.2`,
           to: this.props.pullupTo
         })
@@ -6493,7 +6508,7 @@ export {
   SilkscreenText,
   SmtPad,
   Subcircuit,
-  Trace,
+  Trace2 as Trace,
   TraceHint,
   Transistor,
   Via,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.256",
+  "version": "0.0.257",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -29,6 +29,7 @@
     "bun-match-svg": "0.0.8",
     "circuit-to-svg": "^0.0.97",
     "debug": "^4.3.6",
+    "graphics-debug": "^0.0.4",
     "howfat": "^0.3.8",
     "looks-same": "^9.0.1",
     "pkg-pr-new": "^0.0.37",
@@ -41,7 +42,7 @@
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
     "@tscircuit/footprinter": "^0.0.97",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.26",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.27",
     "@tscircuit/math-utils": "^0.0.5",
     "@tscircuit/props": "^0.0.128",
     "@tscircuit/schematic-autolayout": "^0.0.6",