@tscircuit/core 0.0.554 → 0.0.556

package/dist/index.js

@@ -811,13 +811,12 @@ var PrimitiveComponent2 = class extends Renderable {
    */
   _getPcbManualPlacementForComponent(component) {
     if (!this.isSubcircuit) return null;
-    const layout = this.props.layout;
     const manualEdits = this.props.manualEdits;
-    if (!layout && !manualEdits) return null;
-    const placementConfigPositions = layout?.manual_pcb_placement_config?.positions || manualEdits?.pcb_placements;
+    if (!manualEdits) return null;
+    const placementConfigPositions = manualEdits?.pcb_placements;
     if (!placementConfigPositions) return null;
     for (const position of placementConfigPositions) {
-      if (layout && isMatchingSelector(component, position.selector) || component.props.name === position.selector) {
+      if (isMatchingSelector(component, position.selector) || component.props.name === position.selector) {
         const center = applyToPoint(
           this._computePcbGlobalTransformBeforeLayout(),
           position.center
@@ -4373,6 +4372,8 @@ var computeSchematicNetLabelCenter = ({
 // lib/components/primitive-components/Trace/Trace_doInitialSchematicTraceRender.ts
 import { MultilayerIjump } from "@tscircuit/infgrid-ijump-astar";
 import "circuit-json";
+import { calculateElbow } from "calculate-elbow";
+import { doesLineIntersectLine as doesLineIntersectLine3 } from "@tscircuit/math-utils";
 
 // lib/components/primitive-components/Trace/trace-utils/create-schematic-trace-crossing-segments.ts
 import { distance as distance2, doesLineIntersectLine } from "@tscircuit/math-utils";
@@ -4856,6 +4857,71 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   if (portsWithPosition.length < 2) {
     return;
   }
+  const attemptElbowEdges = () => {
+    const elbowEdges = [];
+    for (let i = 0; i < portsWithPosition.length - 1; i++) {
+      const start = portsWithPosition[i];
+      const end = portsWithPosition[i + 1];
+      const path = calculateElbow(
+        {
+          x: start.position.x,
+          y: start.position.y,
+          facingDirection: start.facingDirection
+        },
+        {
+          x: end.position.x,
+          y: end.position.y,
+          facingDirection: end.facingDirection
+        }
+      );
+      for (let j = 0; j < path.length - 1; j++) {
+        elbowEdges.push({ from: path[j], to: path[j + 1] });
+      }
+    }
+    const doesSegmentIntersectRect = (edge, rect) => {
+      const halfW = rect.width / 2;
+      const halfH = rect.height / 2;
+      const left = rect.center.x - halfW;
+      const right = rect.center.x + halfW;
+      const top = rect.center.y - halfH;
+      const bottom = rect.center.y + halfH;
+      const inRect = (p) => p.x >= left && p.x <= right && p.y >= top && p.y <= bottom;
+      if (inRect(edge.from) || inRect(edge.to)) return true;
+      const rectEdges = [
+        [
+          { x: left, y: top },
+          { x: right, y: top }
+        ],
+        [
+          { x: right, y: top },
+          { x: right, y: bottom }
+        ],
+        [
+          { x: right, y: bottom },
+          { x: left, y: bottom }
+        ],
+        [
+          { x: left, y: bottom },
+          { x: left, y: top }
+        ]
+      ];
+      return rectEdges.some(
+        (r) => doesLineIntersectLine3([edge.from, edge.to], r, { lineThickness: 0 })
+      );
+    };
+    for (const edge of elbowEdges) {
+      for (const obstacle of obstacles) {
+        if (doesSegmentIntersectRect(edge, obstacle)) {
+          return null;
+        }
+      }
+    }
+    return elbowEdges;
+  };
+  let edges = attemptElbowEdges();
+  if (edges && edges.length === 0) {
+    edges = null;
+  }
   connection.pointsToConnect = portsWithPosition.map(({ position }) => ({
     ...position,
     layer: "top"
@@ -4880,54 +4946,56 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     Autorouter = DirectLineRouter;
     skipOtherTraceInteraction = true;
   }
-  const autorouter = new Autorouter({
-    input: simpleRouteJsonInput,
-    MAX_ITERATIONS: 100,
-    OBSTACLE_MARGIN: 0.1,
-    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
+  if (!edges) {
+    const autorouter = new Autorouter({
+      input: simpleRouteJsonInput,
+      MAX_ITERATIONS: 100,
+      OBSTACLE_MARGIN: 0.1,
+      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
+        }
+      ]
+    });
+    let results = autorouter.solveAndMapToTraces();
+    if (results.length === 0) {
+      if (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection()) {
+        trace._doInitialSchematicTraceRenderWithDisplayLabel();
+        return;
       }
-    ]
-  });
-  let results = autorouter.solveAndMapToTraces();
-  if (results.length === 0) {
-    if (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection()) {
-      trace._doInitialSchematicTraceRenderWithDisplayLabel();
-      return;
+      const directLineRouter = new DirectLineRouter({
+        input: simpleRouteJsonInput
+      });
+      results = directLineRouter.solveAndMapToTraces();
+      skipOtherTraceInteraction = true;
+    }
+    const [{ route }] = results;
+    edges = [];
+    for (let i = 0; i < route.length - 1; i++) {
+      edges.push({
+        from: route[i],
+        to: route[i + 1]
+      });
     }
-    const directLineRouter = new DirectLineRouter({
-      input: simpleRouteJsonInput
-    });
-    results = directLineRouter.solveAndMapToTraces();
-    skipOtherTraceInteraction = true;
-  }
-  const [{ route }] = results;
-  let edges = [];
-  for (let i = 0; i < route.length - 1; i++) {
-    edges.push({
-      from: route[i],
-      to: route[i + 1]
-    });
   }
   const source_trace_id = trace.source_trace_id;
   let junctions = [];
@@ -4945,6 +5013,9 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
       source_trace_id: trace.source_trace_id
     });
   }
+  if (!edges || edges.length === 0) {
+    return;
+  }
   const lastEdge = edges[edges.length - 1];
   const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
   const lastDominantDirection = getDominantDirection(lastEdge);
@@ -7882,7 +7953,7 @@ var Group = class extends NormalComponent {
     const { db } = this.root;
     const groupProps2 = props;
     if (!this.isSubcircuit) return;
-    const manualTraceHints = groupProps2.layout?.manual_trace_hints;
+    const manualTraceHints = groupProps2.manualEdits?.manual_trace_hints;
     if (!manualTraceHints) return;
     for (const manualTraceHint of manualTraceHints) {
       this.add(
@@ -10716,7 +10787,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.553",
+  version: "0.0.555",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10740,15 +10811,14 @@ var package_default = {
   devDependencies: {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.93",
-    "@tscircuit/checks": "^0.0.52",
+    "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-util": "^0.0.51",
     "@tscircuit/footprinter": "^0.0.189",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
-    "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.251",
+    "@tscircuit/props": "^0.0.255",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.52",
     "@tscircuit/schematic-match-adapt": "^0.0.16",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.554",
+  "version": "0.0.556",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -25,15 +25,14 @@
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.93",
-    "@tscircuit/checks": "^0.0.52",
+    "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-util": "^0.0.51",
     "@tscircuit/footprinter": "^0.0.189",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
-    "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.251",
+    "@tscircuit/props": "^0.0.255",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-corpus": "^0.0.52",
     "@tscircuit/schematic-match-adapt": "^0.0.16",