@tscircuit/core 0.0.553 → 0.0.555

package/dist/index.js

@@ -4373,6 +4373,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 +4858,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 +4947,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 +5014,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);
@@ -7300,14 +7372,19 @@ var normalizePinLabels = (inputPinLabels) => {
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
 import { corpusNoNetLabel } from "@tscircuit/schematic-corpus";
 import { convertCircuitJsonToBpc } from "circuit-json-to-bpc";
-import { layoutSchematicGraph, getGraphicsForBpcGraph } from "bpc-graph";
+import {
+  getGraphicsForBpcGraph,
+  layoutSchematicGraphVariants
+} from "bpc-graph";
 import Debug5 from "debug";
+import { buildSubtree } from "@tscircuit/circuit-json-util";
 var debug4 = Debug5("Group_doInitialSchematicLayoutMatchAdapt");
 function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const { db } = group.root;
-  const subtreeCircuitJson = structuredClone(db.toArray());
+  const subtreeCircuitJson = buildSubtree(db.toArray(), {
+    source_group_id: group.source_group_id
+  });
   const bpcGraphBeforeGeneratedNetLabels = convertCircuitJsonToBpc(subtreeCircuitJson);
-  console.log("Writing bpcGraphBeforeGeneratedNetLabels.svg");
   if (debug4.enabled) {
     global.debugGraphics?.push(
       getGraphicsForBpcGraph(bpcGraphBeforeGeneratedNetLabels, {
@@ -7315,29 +7392,45 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
       })
     );
   }
-  const targetBpcGraph = convertCircuitJsonToBpc(
+  const floatingGraph = convertCircuitJsonToBpc(
     subtreeCircuitJson
     // .concat(implicitNetLabels),
   );
-  const laidOutBpcGraph = layoutSchematicGraph(targetBpcGraph, {
-    singletonKeys: ["vcc/2", "gnd/2"],
-    centerPinColors: ["netlabel_center", "component_center"],
-    floatingBoxIdsWithMutablePinOffsets: new Set(
-      targetBpcGraph.boxes.filter((box) => {
-        const boxPins = targetBpcGraph.pins.filter(
-          (p) => p.boxId === box.boxId
-        );
-        const nonCenterBoxPins = boxPins.filter(
-          (bp) => !bp.color.includes("center")
-        );
-        if (nonCenterBoxPins.length <= 2) {
-          return true;
-        }
-        return false;
-      }).map((b) => b.boxId)
-    ),
-    corpus: corpusNoNetLabel
-  });
+  const floatingGraphNoNotConnected = {
+    boxes: floatingGraph.boxes,
+    pins: floatingGraph.pins.map((p) => ({
+      ...p,
+      color: p.color.replace("not_connected", "normal")
+    }))
+  };
+  const { result: laidOutBpcGraph } = layoutSchematicGraphVariants(
+    [
+      { variantName: "default", floatingGraph },
+      {
+        variantName: "noNotConnected",
+        floatingGraph: floatingGraphNoNotConnected
+      }
+    ],
+    {
+      singletonKeys: ["vcc/2", "gnd/2"],
+      centerPinColors: ["netlabel_center", "component_center"],
+      floatingBoxIdsWithMutablePinOffsets: new Set(
+        floatingGraph.boxes.filter((box) => {
+          const boxPins = floatingGraph.pins.filter(
+            (p) => p.boxId === box.boxId
+          );
+          const nonCenterBoxPins = boxPins.filter(
+            (bp) => !bp.color.includes("center")
+          );
+          if (nonCenterBoxPins.length <= 2) {
+            return true;
+          }
+          return false;
+        }).map((b) => b.boxId)
+      ),
+      corpus: corpusNoNetLabel
+    }
+  );
   if (debug4.enabled) {
     global.debugGraphics?.push(
       getGraphicsForBpcGraph(laidOutBpcGraph, {
@@ -10695,7 +10788,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.552",
+  version: "0.0.554",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10720,7 +10813,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.93",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.50",
+    "@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",
@@ -10737,7 +10830,7 @@ var package_default = {
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
-    "bpc-graph": "^0.0.53",
+    "bpc-graph": "^0.0.57",
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "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",
@@ -26,7 +26,7 @@
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.93",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.50",
+    "@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",
@@ -43,7 +43,7 @@
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
-    "bpc-graph": "^0.0.53",
+    "bpc-graph": "^0.0.57",
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",