@tscircuit/core 0.0.259 → 0.0.261

package/dist/index.js

@@ -4178,14 +4178,9 @@ var getOtherSchematicTraces = ({
 import { getUnitVectorFromPointAToB } from "@tscircuit/math-utils";
 var createSchematicTraceCrossingSegments = ({
   edges,
-  db,
-  source_trace_id
+  otherEdges
 }) => {
-  const otherEdges = getOtherSchematicTraces({
-    db,
-    source_trace_id,
-    differentNetOnly: true
-  }).flatMap((t) => t.edges);
+  edges = [...edges];
   for (let i = 0; i < edges.length; i++) {
     if (i > 2e3) {
       throw new Error(
@@ -4223,6 +4218,9 @@ var createSchematicTraceCrossingSegments = ({
     }
     const crossingPoint = closestIntersection.crossingPoint;
     const crossingSegmentLength = 0.075;
+    if (crossingPoint.x === edge.from.x && crossingPoint.y === edge.from.y) {
+      continue;
+    }
     const crossingUnitVec = getUnitVectorFromPointAToB(edge.from, crossingPoint);
     const beforeCrossing = {
       x: crossingPoint.x - crossingUnitVec.x * crossingSegmentLength / 2,
@@ -4244,6 +4242,7 @@ var createSchematicTraceCrossingSegments = ({
       i++;
     }
   }
+  return edges;
 };
 
 // lib/components/primitive-components/Trace/create-schematic-trace-junctions.ts
@@ -5034,12 +5033,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     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 "${netLabelText}" for port ${existingFromNetLabel ? fromPortName : toPortName} because it already has a net label with text "${existingFromNetLabel ? existingFromNetLabel.text : existingToNetLabel?.text}".`
-      );
+    if (existingFromNetLabel && existingFromNetLabel.text !== netLabelText) {
+      existingFromNetLabel.text = `${netLabelText} / ${existingFromNetLabel.text}`;
+    }
+    if (existingToNetLabel && existingToNetLabel?.text !== netLabelText) {
+      existingToNetLabel.text = `${netLabelText} / ${existingToNetLabel.text}`;
     }
-    if (netLabelText?.toLocaleLowerCase().includes("gnd") || netLabelText?.toLocaleLowerCase().includes("ground")) {
+    if (!existingFromNetLabel && !existingToNetLabel && (netLabelText?.toLocaleLowerCase().includes("gnd") || netLabelText?.toLocaleLowerCase().includes("ground"))) {
       createDownwardNetLabelGroundSymbol(
         {
           fromPort,
@@ -5053,20 +5053,24 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    db.schematic_net_label.insert({
-      text: this.props.schDisplayLabel ?? pinFullName,
-      source_net_id: toPort.source_port_id,
-      anchor_position: toAnchorPos,
-      center: toAnchorPos,
-      anchor_side: getEnteringEdgeFromDirection(toPort.facingDirection) ?? "bottom"
-    });
-    db.schematic_net_label.insert({
-      text: this.props.schDisplayLabel ?? pinFullName,
-      source_net_id: fromPort.source_port_id,
-      anchor_position: fromAnchorPos,
-      center: fromAnchorPos,
-      anchor_side: getEnteringEdgeFromDirection(fromPort.facingDirection) ?? "bottom"
-    });
+    if (!existingToNetLabel) {
+      db.schematic_net_label.insert({
+        text: this.props.schDisplayLabel ?? pinFullName,
+        source_net_id: toPort.source_port_id,
+        anchor_position: toAnchorPos,
+        center: toAnchorPos,
+        anchor_side: getEnteringEdgeFromDirection(toPort.facingDirection) ?? "bottom"
+      });
+    }
+    if (!existingFromNetLabel) {
+      db.schematic_net_label.insert({
+        text: this.props.schDisplayLabel ?? pinFullName,
+        source_net_id: fromPort.source_port_id,
+        anchor_position: fromAnchorPos,
+        center: fromAnchorPos,
+        anchor_side: getEnteringEdgeFromDirection(fromPort.facingDirection) ?? "bottom"
+      });
+    }
   }
   _isSymbolToChipConnection() {
     const { allPortsFound, ports } = this._findConnectedPorts();
@@ -5192,7 +5196,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       skipOtherTraceInteraction = true;
     }
     const [{ route }] = results;
-    const edges = [];
+    let edges = [];
     for (let i = 0; i < route.length - 1; i++) {
       edges.push({
         from: route[i],
@@ -5203,7 +5207,12 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     let junctions = [];
     if (!skipOtherTraceInteraction) {
       pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
-      createSchematicTraceCrossingSegments({ edges, db, source_trace_id });
+      const otherEdges = getOtherSchematicTraces({
+        db,
+        source_trace_id,
+        differentNetOnly: true
+      }).flatMap((t) => t.edges);
+      edges = createSchematicTraceCrossingSegments({ edges, otherEdges });
       junctions = createSchematicTraceJunctions({
         edges,
         db,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.259",
+  "version": "0.0.261",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",