@tscircuit/core 0.0.256 → 0.0.258

package/dist/index.d.ts

@@ -85,6 +85,10 @@ interface SchematicBoxDimensions {
         width: number;
         height: number;
     };
+    getSizeIncludingPins(): {
+        width: number;
+        height: number;
+    };
 }
 
 type RootCircuitEventName = "asyncEffect:start" | "asyncEffect:end" | "renderable:renderLifecycle:anyEvent" | `renderable:renderLifecycle:${RenderPhase}:start` | `renderable:renderLifecycle:${RenderPhase}:end` | "external:evalError";
@@ -641,7 +645,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
     doInitialSourceTraceRender(): void;
     doInitialPcbTraceRender(): void;
     _doInitialSchematicTraceRenderWithDisplayLabel(): void;
-    private _isPassiveToChipConnection;
+    private _isSymbolToChipConnection;
+    private _isSymbolToSymbolConnection;
     doInitialSchematicTraceRender(): void;
 }
 
@@ -1123,6 +1128,7 @@ declare class Board extends Group<typeof boardProps> {
                 }[] | undefined;
             }>>;
             schAutoLayoutEnabled: z.ZodOptional<z.ZodBoolean>;
+            schTraceAutoLabelEnabled: z.ZodOptional<z.ZodBoolean>;
             routingDisabled: z.ZodOptional<z.ZodBoolean>;
             defaultTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             minTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -1212,6 +1218,7 @@ declare class Board extends Group<typeof boardProps> {
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
+            schTraceAutoLabelEnabled?: boolean | undefined;
             partsEngine?: _tscircuit_props.PartsEngine | undefined;
             outline?: {
                 x: number;
@@ -1276,6 +1283,7 @@ declare class Board extends Group<typeof boardProps> {
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
+            schTraceAutoLabelEnabled?: boolean | undefined;
             partsEngine?: _tscircuit_props.PartsEngine | undefined;
             outline?: {
                 x: string | number;

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
@@ -53,12 +53,14 @@ __export(components_exports, {
 // lib/components/base-components/NormalComponent.ts
 import { fp } from "@tscircuit/footprinter";
 import { point3, rotation } from "circuit-json";
-import Debug3 from "debug";
+import Debug4 from "debug";
 
 // lib/fiber/create-instance-from-react-element.ts
 import ReactReconciler from "react-reconciler";
 
 // lib/components/base-components/Renderable.ts
+import Debug from "debug";
+var debug = Debug("tscircuit:renderable");
 var orderedRenderPhases = [
   "ReactSubtreesRender",
   "InitializePortsFromChildren",
@@ -163,6 +165,7 @@ ${error.stack}`
     });
   }
   _emitRenderLifecycleEvent(phase, startOrEnd) {
+    debug(`${phase}:${startOrEnd} ${this.getString()}`);
     const granular_event_type = `renderable:renderLifecycle:${phase}:${startOrEnd}`;
     const eventPayload = {
       renderId: this._renderId,
@@ -564,8 +567,8 @@ import {
   translate
 } from "transformation-matrix";
 import { z as z2 } from "zod";
-import Debug from "debug";
-var debugSelectAll = Debug("tscircuit:primitive-component:selectAll");
+import Debug2 from "debug";
+var debugSelectAll = Debug2("tscircuit:primitive-component:selectAll");
 var PrimitiveComponent = class extends Renderable {
   parent = null;
   children;
@@ -2480,6 +2483,12 @@ var getAllDimensionsForSchematicBox = (params) => {
     getSize() {
       return { width: schWidth, height: schHeight };
     },
+    getSizeIncludingPins() {
+      return {
+        width: schWidth + (sidePinCounts.leftSize || sidePinCounts.rightSize ? 0.4 : 0),
+        height: schHeight + (sidePinCounts.topSize || sidePinCounts.bottomSize ? 0.4 : 0)
+      };
+    },
     pinCount
   };
 };
@@ -2495,8 +2504,8 @@ import { z as z5 } from "zod";
 // lib/components/primitive-components/Footprint.ts
 import { footprintProps } from "@tscircuit/props";
 import * as kiwi from "@lume/kiwi";
-import Debug2 from "debug";
-var debug = Debug2("tscircuit:core:footprint");
+import Debug3 from "debug";
+var debug2 = Debug3("tscircuit:core:footprint");
 var Footprint = class extends PrimitiveComponent {
   get config() {
     return {
@@ -2654,7 +2663,7 @@ var Footprint = class extends PrimitiveComponent {
       }
     }
     solver.updateVariables();
-    if (debug.enabled) {
+    if (debug2.enabled) {
       console.log("Solution to layout constraints:");
       console.table(
         Object.entries(kVars).map(([key, kvar]) => ({
@@ -2717,7 +2726,7 @@ var getNumericSchPinStyle = (pinStyles, pinLabels) => {
 };
 
 // lib/components/base-components/NormalComponent.ts
-var debug2 = Debug3("tscircuit:core");
+var debug3 = Debug4("tscircuit:core");
 var rotation3 = z5.object({
   x: rotation,
   y: rotation,
@@ -3010,6 +3019,10 @@ var NormalComponent = class extends PrimitiveComponent {
       center,
       rotation: props.schRotation ?? 0,
       size: dimensions.getSize(),
+      // We should be using the full size, but circuit-to-svg incorrectly
+      // uses the schematic_component size to draw boxes instead of the
+      // schematic_box size
+      // size: dimensions.getSizeIncludingPins(),
       port_arrangement: underscorifyPortArrangement(
         props.schPortArrangement
       ),
@@ -3145,7 +3158,7 @@ var NormalComponent = class extends PrimitiveComponent {
         (p) => p.isMatchingAnyOf(component.getNameAndAliases())
       );
       if (conflictingPort) {
-        debug2(
+        debug3(
           `Similar ports added. Port 1: ${conflictingPort}, Port 2: ${component}`
         );
       }
@@ -3536,7 +3549,7 @@ var getSimpleRouteJsonFromTracesAndDb = ({
 };
 
 // lib/components/primitive-components/Group/Group.ts
-import Debug4 from "debug";
+import Debug5 from "debug";
 var Group = class extends NormalComponent {
   _asyncAutoroutingResult = null;
   get config() {
@@ -3604,9 +3617,9 @@ var Group = class extends NormalComponent {
     if (this._shouldUseTraceByTraceRouting()) return;
     const serverUrl = this.props.autorouter?.serverUrl ?? "https://registry-api.tscircuit.com";
     const serverMode = this.props.autorouter?.serverMode ?? "job";
-    const debug3 = Debug4("tscircuit:core:autorouting");
+    const debug4 = Debug5("tscircuit:core:autorouting");
     const fetchWithDebug = (url, options) => {
-      debug3("fetching", url);
+      debug4("fetching", url);
       return fetch(url, options);
     };
     this._queueAsyncEffect("make-http-autorouting-request", async () => {
@@ -4475,6 +4488,72 @@ function getTraceDisplayName({
   return void 0;
 }
 
+// lib/components/primitive-components/Trace/get-obstacles-for-trace.ts
+import { getUnitVectorFromDirection } from "@tscircuit/math-utils";
+var getSchematicObstaclesForTrace = (trace) => {
+  const db = trace.root.db;
+  const connectedPorts = trace._findConnectedPorts().ports ?? [];
+  const connectedPortIds = new Set(
+    connectedPorts.map((p) => p.schematic_port_id)
+  );
+  const obstacles = [];
+  for (const elm of db.toArray()) {
+    if (elm.type === "schematic_component") {
+      const isSymbol = Boolean(elm.symbol_name);
+      const dominateAxis = elm.size.width > elm.size.height ? "horz" : "vert";
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: elm.center,
+        width: elm.size.width + (isSymbol && dominateAxis === "horz" ? -0.5 : 0),
+        height: elm.size.height + (isSymbol && dominateAxis === "vert" ? -0.5 : 0),
+        connectedTo: []
+      });
+    }
+    if (elm.type === "schematic_port") {
+      if (connectedPortIds.has(elm.schematic_port_id)) {
+        continue;
+      }
+      const dirVec = elm.facing_direction ? getUnitVectorFromDirection(elm.facing_direction) : {
+        x: 0,
+        y: 0
+      };
+      obstacles.push({
+        type: "rect",
+        layers: ["top"],
+        center: {
+          x: elm.center.x - dirVec.x * 0.1,
+          y: elm.center.y - dirVec.y * 0.1
+        },
+        width: 0.1 + Math.abs(dirVec.x) * 0.3,
+        height: 0.1 + Math.abs(dirVec.y) * 0.3,
+        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: []
+      });
+    }
+  }
+  return obstacles;
+};
+
 // lib/components/primitive-components/Trace/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
@@ -4484,7 +4563,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;
@@ -4946,12 +5025,16 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     }
     const existingFromNetLabel = db.schematic_net_label.list().find((label) => label.source_net_id === fromPort.source_port_id);
     const existingToNetLabel = db.schematic_net_label.list().find((label) => label.source_net_id === toPort.source_port_id);
-    if (existingFromNetLabel && existingFromNetLabel.text !== this.props.schDisplayLabel || existingToNetLabel && existingToNetLabel?.text !== this.props.schDisplayLabel) {
+    const [firstPort, secondPort] = connectedPorts.map(({ port }) => port);
+    const isFirstPortSchematicBox = firstPort.parent?.config.shouldRenderAsSchematicBox;
+    const pinFullName = isFirstPortSchematicBox ? `${firstPort?.parent?.props.name}_${firstPort?.props.name}` : `${secondPort?.parent?.props.name}_${secondPort?.props.name}`;
+    const netLabelText = this.props.schDisplayLabel ?? pinFullName;
+    if (existingFromNetLabel && existingFromNetLabel.text !== netLabelText || existingToNetLabel && existingToNetLabel?.text !== netLabelText) {
       throw new Error(
-        `Cannot create net label for port ${existingFromNetLabel ? fromPortName : toPortName} because it already has a net label with text "${existingFromNetLabel ? existingFromNetLabel.text : existingToNetLabel?.text}".`
+        `Cannot create net label "${netLabelText}" for port ${existingFromNetLabel ? fromPortName : toPortName} because it already has a net label with text "${existingFromNetLabel ? existingFromNetLabel.text : existingToNetLabel?.text}".`
       );
     }
-    if (this.props.schDisplayLabel?.toLocaleLowerCase().includes("gnd") || this.props.schDisplayLabel?.toLocaleLowerCase().includes("ground")) {
+    if (netLabelText?.toLocaleLowerCase().includes("gnd") || netLabelText?.toLocaleLowerCase().includes("ground")) {
       createDownwardNetLabelGroundSymbol(
         {
           fromPort,
@@ -4965,9 +5048,6 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    const [firstPort, secondPort] = connectedPorts.map(({ port }) => port);
-    const isFirstPortSchematicBox = firstPort.parent?.config.shouldRenderAsSchematicBox;
-    const pinFullName = isFirstPortSchematicBox ? `${firstPort?.parent?.props.name}_${firstPort?.props.name}` : `${secondPort?.parent?.props.name}_${secondPort?.props.name}`;
     db.schematic_net_label.insert({
       text: this.props.schDisplayLabel ?? pinFullName,
       source_net_id: toPort.source_port_id,
@@ -4983,7 +5063,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       anchor_side: getEnteringEdgeFromDirection(fromPort.facingDirection) ?? "bottom"
     });
   }
-  _isPassiveToChipConnection() {
+  _isSymbolToChipConnection() {
     const { allPortsFound, ports } = this._findConnectedPorts();
     if (!allPortsFound || ports.length !== 2) return false;
     const [port1, port2] = ports;
@@ -4992,6 +5072,15 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const isPort2Chip = port2.parent.config.shouldRenderAsSchematicBox;
     return isPort1Chip && !isPort2Chip || !isPort1Chip && isPort2Chip;
   }
+  _isSymbolToSymbolConnection() {
+    const { allPortsFound, ports } = this._findConnectedPorts();
+    if (!allPortsFound || ports.length !== 2) return false;
+    const [port1, port2] = ports;
+    if (!port1?.parent || !port2?.parent) return false;
+    const isPort1Symbol = !port1.parent.config.shouldRenderAsSchematicBox;
+    const isPort2Symbol = !port2.parent.config.shouldRenderAsSchematicBox;
+    return isPort1Symbol && isPort2Symbol;
+  }
   doInitialSchematicTraceRender() {
     if (this.root?.schematicDisabled) return;
     const { db } = this.root;
@@ -5000,76 +5089,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,24 +5126,66 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       layer: "top"
     }));
     const bounds = computeObstacleBounds(obstacles);
+    const BOUNDS_MARGIN = 2;
     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;
+    let skipOtherTraceInteraction = false;
     if (this.getSubcircuit().props._schDirectLineRoutingEnabled) {
       Autorouter = DirectLineRouter;
+      skipOtherTraceInteraction = true;
     }
     const autorouter = new Autorouter({
       input: simpleRouteJsonInput,
+      MAX_ITERATIONS: 100,
       OBSTACLE_MARGIN: 0.1,
-      isRemovePathLoopsEnabled: true
+      isRemovePathLoopsEnabled: true,
+      isShortenPathWithShortcutsEnabled: true,
+      marginsWithCosts: [
+        {
+          margin: 1,
+          enterCost: 0,
+          travelCostFactor: 1
+        },
+        {
+          margin: 0.3,
+          enterCost: 0,
+          travelCostFactor: 1
+        },
+        {
+          margin: 0.2,
+          enterCost: 0,
+          travelCostFactor: 2
+        },
+        {
+          margin: 0.1,
+          enterCost: 0,
+          travelCostFactor: 3
+        }
+      ]
     });
-    const results = autorouter.solveAndMapToTraces();
-    if (results.length === 0) return;
+    let results = autorouter.solveAndMapToTraces();
+    if (results.length === 0) {
+      if (this._isSymbolToChipConnection() || this._isSymbolToSymbolConnection()) {
+        this._doInitialSchematicTraceRenderWithDisplayLabel();
+        return;
+      }
+      const directLineRouter = new DirectLineRouter({
+        input: simpleRouteJsonInput
+      });
+      results = directLineRouter.solveAndMapToTraces();
+      skipOtherTraceInteraction = true;
+    }
     const [{ route }] = results;
     const edges = [];
     for (let i = 0; i < route.length - 1; i++) {
@@ -5125,13 +5195,16 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
     }
     const source_trace_id = this.source_trace_id;
-    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
-    createSchematicTraceCrossingSegments({ edges, db, source_trace_id });
-    const junctions = createSchematicTraceJunctions({
-      edges,
-      db,
-      source_trace_id: this.source_trace_id
-    });
+    let junctions = [];
+    if (!skipOtherTraceInteraction) {
+      pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
+      createSchematicTraceCrossingSegments({ edges, db, source_trace_id });
+      junctions = createSchematicTraceJunctions({
+        edges,
+        db,
+        source_trace_id: this.source_trace_id
+      });
+    }
     const lastEdge = edges[edges.length - 1];
     const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
     const lastDominantDirection = getDominantDirection(lastEdge);
@@ -5151,17 +5224,16 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     if (!this.source_trace_id) {
       throw new Error("Missing source_trace_id for schematic trace insertion.");
     }
-    if (countComplexElements(junctions, edges) >= 5 && this._isPassiveToChipConnection()) {
+    if (this.getSubcircuit()._parsedProps.schTraceAutoLabelEnabled && countComplexElements(junctions, edges) >= 5 && (this._isSymbolToChipConnection() || this._isSymbolToSymbolConnection())) {
       this._doInitialSchematicTraceRenderWithDisplayLabel();
-      db.schematic_trace.delete(this.schematic_trace_id);
-    } else {
-      const trace = db.schematic_trace.insert({
-        source_trace_id: this.source_trace_id,
-        edges,
-        junctions
-      });
-      this.schematic_trace_id = trace.schematic_trace_id;
+      return;
     }
+    const trace = db.schematic_trace.insert({
+      source_trace_id: this.source_trace_id,
+      edges,
+      junctions
+    });
+    this.schematic_trace_id = trace.schematic_trace_id;
   }
 };
 
@@ -5197,13 +5269,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 +5493,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 +6565,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.258",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,8 +27,9 @@
     "@types/react": "^19.0.1",
     "@types/react-reconciler": "^0.28.8",
     "bun-match-svg": "0.0.8",
-    "circuit-to-svg": "^0.0.97",
+    "circuit-to-svg": "^0.0.99",
     "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,9 +42,9 @@
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
     "@tscircuit/footprinter": "^0.0.97",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.26",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/math-utils": "^0.0.5",
-    "@tscircuit/props": "^0.0.128",
+    "@tscircuit/props": "^0.0.129",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.41",
     "circuit-json": "^0.0.128",
@@ -53,7 +54,7 @@
     "performance-now": "^2.1.0",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",
-    "schematic-symbols": "^0.0.111",
+    "schematic-symbols": "^0.0.113",
     "transformation-matrix": "^2.16.1",
     "zod": "^3.23.8"
   }