@tscircuit/core 0.0.1262 → 0.0.1264

package/dist/index.js

@@ -17489,6 +17489,7 @@ import Debug11 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
 import "@tscircuit/schematic-trace-solver";
+var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
 function createSchematicTraceSolverInputProblem(group) {
   const { db } = group.root;
   const connKeyToSourceNet = /* @__PURE__ */ new Map();
@@ -17613,9 +17614,28 @@ function createSchematicTraceSolverInputProblem(group) {
         if (st.subcircuit_connectivity_map_key) {
           userNetIdToConnKey.set(userNetId, st.subcircuit_connectivity_map_key);
         }
+        const portA = db.schematic_port.get(a);
+        const portB = db.schematic_port.get(b);
+        let portDistance = 0;
+        if (portA && portB) {
+          portDistance = Math.sqrt(
+            (portA.center.x - portB.center.x) ** 2 + (portA.center.y - portB.center.y) ** 2
+          );
+        }
+        const maxMspDist = group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE;
+        let netLabelWidth;
+        if (st.display_name && !st.display_name.startsWith(".") && portDistance > maxMspDist) {
+          netLabelWidth = Number(
+            getSchematicNetLabelTextWidth({
+              text: String(st.display_name),
+              font_size: 0.14
+            }).toFixed(2)
+          );
+        }
         directConnections.push({
           pinIds: [a, b].map((id) => schematicPortIdToPinId.get(id)),
-          netId: userNetId
+          netId: userNetId,
+          netLabelWidth
         });
       }
     }
@@ -17678,7 +17698,7 @@ function createSchematicTraceSolverInputProblem(group) {
     directConnections,
     netConnections,
     availableNetLabelOrientations,
-    maxMspPairDistance: group._parsedProps.schMaxTraceDistance ?? 2.4
+    maxMspPairDistance: group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE
   };
   return {
     inputProblem,
@@ -20360,9 +20380,20 @@ var Group5 = class extends NormalComponent3 {
     const { traces: routedTraces } = this._asyncAutoroutingResult.output_simple_route_json;
     if (!routedTraces) return;
     for (const routedTrace of routedTraces) {
+      const cjRoute = routedTrace.route.map((point6) => {
+        if (point6.route_type !== "through_obstacle") return point6;
+        return {
+          route_type: "through_pad",
+          start: point6.start,
+          end: point6.end,
+          start_layer: point6.from_layer,
+          end_layer: point6.to_layer,
+          width: point6.width
+        };
+      });
       const pcb_trace = db.pcb_trace.insert({
         subcircuit_id: this.subcircuit_id,
-        route: routedTrace.route
+        route: cjRoute
         // source_trace_id: circuitTrace.source_trace_id!,
       });
     }
@@ -20410,9 +20441,20 @@ var Group5 = class extends NormalComponent3 {
         delete pcb_trace.source_trace_id;
       }
       pcb_trace.subcircuit_id ??= (sourceTraceId ? db.source_trace.get(sourceTraceId)?.subcircuit_id ?? db.source_net.get(sourceTraceId)?.subcircuit_id : void 0) ?? this.subcircuit_id;
-      let segments = splitPcbTracesOnJumperSegments(pcb_trace.route);
+      const cjRoute = pcb_trace.route.map((point6) => {
+        if (point6.route_type !== "through_obstacle") return point6;
+        return {
+          route_type: "through_pad",
+          start: point6.start,
+          end: point6.end,
+          start_layer: point6.from_layer,
+          end_layer: point6.to_layer,
+          width: point6.width
+        };
+      });
+      let segments = splitPcbTracesOnJumperSegments(cjRoute);
       if (segments === null) {
-        segments = [pcb_trace.route];
+        segments = [cjRoute];
       }
       const processedSegments = addPortIdsToTracesAtJumperPads(segments, db);
       for (const segment2 of processedSegments) {
@@ -21508,7 +21550,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1261",
+  version: "0.0.1263",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21557,7 +21599,7 @@ var package_default = {
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
     "@tscircuit/props": "^0.0.536",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.57",
+    "@tscircuit/schematic-trace-solver": "^0.0.60",
     "@tscircuit/solver-utils": "^0.0.3",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1262",
+  "version": "0.0.1264",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -50,7 +50,7 @@
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
     "@tscircuit/props": "^0.0.536",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.57",
+    "@tscircuit/schematic-trace-solver": "^0.0.60",
     "@tscircuit/solver-utils": "^0.0.3",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",