@tscircuit/core 0.0.487 → 0.0.489

package/dist/index.d.ts

@@ -760,6 +760,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
         ports?: undefined;
         portsWithSelectors?: undefined;
     };
+    _resolveNet(selector: string): Net | null;
     _findConnectedNets(): {
         nets: Net[];
         netsWithSelectors: Array<{

package/dist/index.js

@@ -4668,11 +4668,24 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       ports: portsWithSelectors.map(({ port }) => port)
     };
   }
+  _resolveNet(selector) {
+    const direct = this.getSubcircuit().selectOne(selector, {
+      type: "net"
+    });
+    if (direct) return direct;
+    const match = selector.match(/^net\.(.+)$/);
+    const netName = match ? match[1] : null;
+    if (!netName) return null;
+    const allDescendants = this.root._getBoard().getDescendants();
+    return allDescendants.find(
+      (d) => d.componentName === "Net" && d._parsedProps.name === netName
+    ) || null;
+  }
   _findConnectedNets() {
     const netsWithSelectors = this.getTracePathNetSelectors().map(
       (selector) => ({
         selector,
-        net: this.getSubcircuit().selectOne(selector, { type: "net" })
+        net: this._resolveNet(selector)
       })
     );
     const undefinedNets = netsWithSelectors.filter((n) => !n.net);
@@ -5179,10 +5192,35 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       facingDirection: port.facingDirection
     }));
     const isPortAndNetConnection = portsWithPosition.length === 1 && netsWithSelectors.length === 1;
-    if (this.props.schDisplayLabel) {
-      if (isPortAndNetConnection) {
-        const net = netsWithSelectors[0].net;
-        const { port, position: anchorPos } = portsWithPosition[0];
+    if (isPortAndNetConnection) {
+      const net = netsWithSelectors[0].net;
+      const { port, position: anchorPos } = portsWithPosition[0];
+      const connectedNetLabel = this.getSubcircuit().selectAll("netlabel").find((nl) => {
+        const conn = nl._parsedProps.connection ?? nl._parsedProps.connectsTo;
+        if (!conn) return false;
+        const targetPort = this.getSubcircuit().selectOne(conn, {
+          port: true
+        });
+        return targetPort === port;
+      });
+      if (connectedNetLabel) {
+        const labelPos = connectedNetLabel._getGlobalSchematicPositionBeforeLayout();
+        const edges2 = [];
+        if (anchorPos.x === labelPos.x || anchorPos.y === labelPos.y) {
+          edges2.push({ from: anchorPos, to: labelPos });
+        } else {
+          edges2.push({ from: anchorPos, to: { x: labelPos.x, y: anchorPos.y } });
+          edges2.push({ from: { x: labelPos.x, y: anchorPos.y }, to: labelPos });
+        }
+        const trace2 = db.schematic_trace.insert({
+          source_trace_id: this.source_trace_id,
+          edges: edges2,
+          junctions: []
+        });
+        this.schematic_trace_id = trace2.schematic_trace_id;
+        return;
+      }
+      if (this.props.schDisplayLabel) {
         db.schematic_net_label.insert({
           text: this.props.schDisplayLabel,
           source_net_id: net.source_net_id,
@@ -5191,14 +5229,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           anchor_side: getEnteringEdgeFromDirection(port.facingDirection) ?? "bottom"
         });
         return;
-      } else if ("from" in this.props && "to" in this.props || "path" in this.props) {
-        this._doInitialSchematicTraceRenderWithDisplayLabel();
-        return;
       }
-    }
-    if (isPortAndNetConnection) {
-      const net = netsWithSelectors[0].net;
-      const { port, position: anchorPos } = portsWithPosition[0];
       const netLabel = db.schematic_net_label.insert({
         text: net._parsedProps.name,
         source_net_id: net.source_net_id,
@@ -5209,6 +5240,12 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
       return;
     }
+    if (this.props.schDisplayLabel) {
+      if ("from" in this.props && "to" in this.props || "path" in this.props) {
+        this._doInitialSchematicTraceRenderWithDisplayLabel();
+        return;
+      }
+    }
     if (portsWithPosition.length < 2) {
       return;
     }
@@ -10228,7 +10265,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.486",
+  version: "0.0.487",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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