@tscircuit/core 0.0.1246 → 0.0.1248

package/dist/index.d.ts

@@ -131711,6 +131711,7 @@ declare class Mosfet extends NormalComponent<typeof mosfetProps> {
 }
 
 declare class OpAmp extends NormalComponent<typeof opampProps, OpAmpPinLabels> {
+    getSchematicSymbolName(): BaseSymbolName;
     get config(): {
         componentName: string;
         schematicSymbolName: BaseSymbolName;

package/dist/index.js

@@ -35,7 +35,7 @@ __export(components_exports, {
   Fiducial: () => Fiducial,
   Footprint: () => Footprint,
   Fuse: () => Fuse,
-  Group: () => Group6,
+  Group: () => Group5,
   Hole: () => Hole,
   Inductor: () => Inductor,
   Interconnect: () => Interconnect,
@@ -2226,8 +2226,8 @@ var Net = class extends PrimitiveComponent2 {
   doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const isGround = props.name.startsWith("GND");
-    const isPositiveVoltageSource = props.name.startsWith("V");
+    const isGround = props.isGroundNet ?? props.name.startsWith("GND");
+    const isPositiveVoltageSource = props.isPowerNet ?? props.name.startsWith("V");
     const net = db.source_net.insert({
       name: props.name,
       member_source_group_ids: [],
@@ -3104,14 +3104,22 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
 };
 
 // lib/utils/schematic/computeSchematicNetLabelCenter.ts
+var getSchematicNetLabelTextWidth = ({
+  text,
+  font_size = 0.18
+}) => {
+  const fontScale = font_size / 0.18;
+  const charWidth = 0.12 * fontScale;
+  const horizontalPadding = 0.12 * fontScale;
+  return text.length * charWidth + horizontalPadding;
+};
 var computeSchematicNetLabelCenter = ({
   anchor_position,
   anchor_side,
   text,
   font_size = 0.18
 }) => {
-  const charWidth = 0.1 * (font_size / 0.18);
-  const width = text.length * charWidth;
+  const width = getSchematicNetLabelTextWidth({ text, font_size });
   const height = font_size;
   const center = { ...anchor_position };
   switch (anchor_side) {
@@ -17425,20 +17433,15 @@ var Group_doInitialSchematicBoxComponentRender = (group) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
-import { SchematicTracePipelineSolver as SchematicTracePipelineSolver4 } from "@tscircuit/schematic-trace-solver";
+import { SchematicTracePipelineSolver as SchematicTracePipelineSolver3 } from "@tscircuit/schematic-trace-solver";
 import Debug11 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
 import "@tscircuit/schematic-trace-solver";
 function createSchematicTraceSolverInputProblem(group) {
   const { db } = group.root;
-  const sckToSourceNet = /* @__PURE__ */ new Map();
-  const sckToUserNetId = /* @__PURE__ */ new Map();
-  const allScks = /* @__PURE__ */ new Set();
+  const connKeyToSourceNet = /* @__PURE__ */ new Map();
   const traces = group.selectAll("trace");
-  const displayLabelTraces = traces.filter(
-    (t) => t._parsedProps?.schDisplayLabel
-  );
   const childGroups = group.selectAll("group");
   const allSchematicGroupIds = [
     group.schematic_group_id,
@@ -17495,7 +17498,7 @@ function createSchematicTraceSolverInputProblem(group) {
   const allSourceAndSchematicPortIdsInScope = /* @__PURE__ */ new Set();
   const schPortIdToSourcePortId = /* @__PURE__ */ new Map();
   const sourcePortIdToSchPortId = /* @__PURE__ */ new Map();
-  const userNetIdToSck = /* @__PURE__ */ new Map();
+  const userNetIdToConnKey = /* @__PURE__ */ new Map();
   for (const sc of schematicComponents) {
     const ports = db.schematic_port.list({
       schematic_component_id: sc.schematic_component_id
@@ -17530,7 +17533,19 @@ function createSchematicTraceSolverInputProblem(group) {
     }
   }
   const directConnections = [];
-  const pairKeyToSourceTraceId = /* @__PURE__ */ new Map();
+  const connectedPairKeys = /* @__PURE__ */ new Set();
+  const connKeysWithExplicitPortNetTraces = /* @__PURE__ */ new Set();
+  for (const trace of traces) {
+    if (trace.parent !== group) continue;
+    const sourceTraceId = trace.source_trace_id;
+    if (!sourceTraceId) continue;
+    const sourceTrace = db.source_trace.get(sourceTraceId);
+    if (sourceTrace?.subcircuit_connectivity_map_key && (sourceTrace.connected_source_port_ids?.length ?? 0) > 0 && (sourceTrace.connected_source_net_ids?.length ?? 0) > 0) {
+      connKeysWithExplicitPortNetTraces.add(
+        sourceTrace.subcircuit_connectivity_map_key
+      );
+    }
+  }
   for (const st of db.source_trace.list()) {
     if (st.subcircuit_id && !allowedSubcircuitIds.has(st.subcircuit_id)) {
       continue;
@@ -17541,13 +17556,11 @@ function createSchematicTraceSolverInputProblem(group) {
     if (connected.length >= 2) {
       const [a, b] = connected.slice(0, 2);
       const pairKey = [a, b].sort().join("::");
-      if (!pairKeyToSourceTraceId.has(pairKey)) {
-        pairKeyToSourceTraceId.set(pairKey, st.source_trace_id);
+      if (!connectedPairKeys.has(pairKey)) {
+        connectedPairKeys.add(pairKey);
         const userNetId = st.display_name ?? st.source_trace_id;
         if (st.subcircuit_connectivity_map_key) {
-          allScks.add(st.subcircuit_connectivity_map_key);
-          userNetIdToSck.set(userNetId, st.subcircuit_connectivity_map_key);
-          sckToUserNetId.set(st.subcircuit_connectivity_map_key, userNetId);
+          userNetIdToConnKey.set(userNetId, st.subcircuit_connectivity_map_key);
         }
         directConnections.push({
           pinIds: [a, b].map((id) => schematicPortIdToPinId.get(id)),
@@ -17561,31 +17574,26 @@ function createSchematicTraceSolverInputProblem(group) {
     (n) => !n.subcircuit_id || allowedSubcircuitIds.has(n.subcircuit_id)
   )) {
     if (net.subcircuit_connectivity_map_key) {
-      allScks.add(net.subcircuit_connectivity_map_key);
-      sckToSourceNet.set(net.subcircuit_connectivity_map_key, net);
+      connKeyToSourceNet.set(net.subcircuit_connectivity_map_key, net);
     }
   }
-  const sckToPinIds = /* @__PURE__ */ new Map();
+  const connKeyToPinIds = /* @__PURE__ */ new Map();
   for (const [schId, srcPortId] of schPortIdToSourcePortId) {
     const sp = db.source_port.get(srcPortId);
     if (!sp?.subcircuit_connectivity_map_key) continue;
-    const sck = sp.subcircuit_connectivity_map_key;
-    allScks.add(sck);
-    if (!sckToPinIds.has(sck)) sckToPinIds.set(sck, []);
-    sckToPinIds.get(sck).push(schId);
-  }
-  for (const [subcircuitConnectivityKey, schematicPortIds] of sckToPinIds) {
-    const sourceNet = sckToSourceNet.get(subcircuitConnectivityKey);
-    if (sourceNet && schematicPortIds.length >= 2) {
+    const connKey = sp.subcircuit_connectivity_map_key;
+    if (!connKeyToPinIds.has(connKey)) connKeyToPinIds.set(connKey, []);
+    connKeyToPinIds.get(connKey).push(schId);
+  }
+  for (const [connKey, schematicPortIds] of connKeyToPinIds) {
+    const sourceNet = connKeyToSourceNet.get(connKey);
+    if (sourceNet && schematicPortIds.length >= 1) {
       const userNetId = String(
-        sourceNet.name || sourceNet.source_net_id || subcircuitConnectivityKey
+        sourceNet.name || sourceNet.source_net_id || connKey
       );
-      userNetIdToSck.set(userNetId, subcircuitConnectivityKey);
-      sckToUserNetId.set(subcircuitConnectivityKey, userNetId);
-      const fontSize = 0.18;
-      const charWidth = 0.1 * (fontSize / 0.18);
+      userNetIdToConnKey.set(userNetId, connKey);
       const netLabelWidth = Number(
-        (String(userNetId).length * charWidth).toFixed(2)
+        getSchematicNetLabelTextWidth({ text: String(userNetId) }).toFixed(2)
       );
       netConnections.push({
         netId: userNetId,
@@ -17604,9 +17612,9 @@ function createSchematicTraceSolverInputProblem(group) {
     )) {
       if (!net.name) continue;
       if (!presentNetIds.has(net.name)) continue;
-      if (net.is_ground || net.name.toLowerCase().startsWith("gnd")) {
+      if (net.is_ground) {
         netToAllowedOrientations[net.name] = ["y-"];
-      } else if (net.is_power || net.name.toLowerCase().startsWith("v")) {
+      } else if (net.is_power) {
         netToAllowedOrientations[net.name] = ["y+"];
       } else {
         netToAllowedOrientations[net.name] = ["x-", "x+"];
@@ -17624,14 +17632,11 @@ function createSchematicTraceSolverInputProblem(group) {
   return {
     inputProblem,
     pinIdToSchematicPortId,
-    pairKeyToSourceTraceId,
-    sckToSourceNet,
-    sckToUserNetId,
-    userNetIdToSck,
+    connKeyToSourceNet,
+    userNetIdToConnKey,
+    connKeysWithExplicitPortNetTraces,
     allSourceAndSchematicPortIdsInScope,
-    schPortIdToSourcePortId,
-    displayLabelTraces,
-    allScks
+    schPortIdToSourcePortId
   };
 }
 
@@ -17962,12 +17967,29 @@ function computeJunctions(traces, opts = {}) {
 import Debug9 from "debug";
 var debug7 = Debug9("Group_doInitialSchematicTraceRender");
 function applyTracesFromSolverOutput(args) {
-  const { group, solver, pinIdToSchematicPortId, userNetIdToSck } = args;
+  const {
+    group,
+    solver,
+    pinIdToSchematicPortId,
+    userNetIdToConnKey,
+    schematicPortIdsWithPreExistingNetLabels
+  } = args;
   const { db } = group.root;
-  const traces = solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths;
+  const traces = solver.netLabelTraceCollisionSolver?.getOutput().traces ?? solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths;
   const pendingTraces = [];
   debug7(`Traces inside SchematicTraceSolver output: ${(traces ?? []).length}`);
   for (const solvedTracePath of traces ?? []) {
+    const uniquePinIds = Array.from(new Set(solvedTracePath.pinIds ?? []));
+    const solvedTraceSchematicPortIds = uniquePinIds.map((pinId) => pinIdToSchematicPortId.get(pinId)).filter((id) => Boolean(id));
+    const isNetLabelStubTrace = uniquePinIds.length <= 1 && solvedTraceSchematicPortIds.length > 0 && solvedTraceSchematicPortIds.every(
+      (id) => schematicPortIdsWithPreExistingNetLabels.has(id)
+    );
+    if (isNetLabelStubTrace) {
+      debug7(
+        `Skipping solver netlabel stub trace ${solvedTracePath?.mspPairId} because schematic port already has a netlabel`
+      );
+      continue;
+    }
     const points = solvedTracePath?.tracePath;
     if (!Array.isArray(points) || points.length < 2) {
       debug7(
@@ -17982,7 +18004,7 @@ function applyTracesFromSolverOutput(args) {
         to: { x: points[i + 1].x, y: points[i + 1].y }
       });
     }
-    let source_trace_id = null;
+    const source_trace_id = String(solvedTracePath?.mspPairId);
     let subcircuit_connectivity_map_key;
     if (Array.isArray(solvedTracePath?.pins) && solvedTracePath.pins.length === 2) {
       const pA = pinIdToSchematicPortId.get(solvedTracePath.pins[0]?.pinId);
@@ -17992,14 +18014,13 @@ function applyTracesFromSolverOutput(args) {
           const existing = db.schematic_port.get(schPid);
           if (existing) db.schematic_port.update(schPid, { is_connected: true });
         }
-        subcircuit_connectivity_map_key = userNetIdToSck.get(
+        subcircuit_connectivity_map_key = userNetIdToConnKey.get(
           String(solvedTracePath.userNetId)
         );
       }
     }
-    if (!source_trace_id) {
-      source_trace_id = `solver_${solvedTracePath?.mspPairId}`;
-      subcircuit_connectivity_map_key = userNetIdToSck.get(
+    if (!subcircuit_connectivity_map_key) {
+      subcircuit_connectivity_map_key = userNetIdToConnKey.get(
         String(solvedTracePath.userNetId)
       );
     }
@@ -18078,17 +18099,15 @@ function applyNetLabelPlacements(args) {
   const {
     group,
     solver,
-    sckToSourceNet,
-    allScks,
-    allSourceAndSchematicPortIdsInScope,
-    schPortIdToSourcePortId,
-    userNetIdToSck,
+    connKeyToSourceNet,
+    userNetIdToConnKey,
     pinIdToSchematicPortId,
+    connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
     schematicPortIdsWithRoutedTraces
   } = args;
   const { db } = group.root;
-  const netLabelPlacements = solver.netLabelPlacementSolver?.netLabelPlacements ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().netLabelPlacements ?? [];
+  const netLabelPlacements = solver.netLabelTraceCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelPlacementSolver?.netLabelPlacements ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().netLabelPlacements ?? [];
   const netLabelPlacementCountByGlobalNetId = /* @__PURE__ */ new Map();
   for (const placement of netLabelPlacements) {
     netLabelPlacementCountByGlobalNetId.set(
@@ -18099,12 +18118,15 @@ function applyNetLabelPlacements(args) {
   const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
   for (const placement of netLabelPlacements) {
     debug8(`processing placement: ${placement.netId}`);
-    const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToSck.get(id));
-    const placementSck = userNetIdToSck.get(placementUserNetId);
+    const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
+    const placementConnKey = userNetIdToConnKey.get(placementUserNetId);
     const anchor_position = placement.anchorPoint;
     const orientation = placement.orientation;
     const anchor_side = oppositeSide(orientation);
-    const sourceNet = placementSck ? sckToSourceNet.get(placementSck) : void 0;
+    let sourceNet;
+    if (placementConnKey) {
+      sourceNet = connKeyToSourceNet.get(placementConnKey);
+    }
     const schPortIds = placement.pinIds.map(
       (pinId) => pinIdToSchematicPortId.get(pinId)
     );
@@ -18117,22 +18139,38 @@ function applyNetLabelPlacements(args) {
       continue;
     }
     if (sourceNet) {
+      const isPowerOrGroundNet = sourceNet.is_ground || sourceNet.is_power;
+      const hasExplicitPortNetTrace = connKeysWithExplicitPortNetTraces.has(
+        placementConnKey
+      );
+      const hasRoutedTraceForPlacementPort = schPortIds.some(
+        (id) => schematicPortIdsWithRoutedTraces.has(id)
+      );
+      const hasSingleLabelPlacement = (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) <= 1;
+      const shouldSkipImplicitSignalNetLabel = !hasExplicitPortNetTrace && !isPowerOrGroundNet && hasRoutedTraceForPlacementPort && hasSingleLabelPlacement;
+      if (shouldSkipImplicitSignalNetLabel) {
+        debug8(
+          `skipping net label placement for "${placement.netId}" REASON:schematic port has routed trace`
+        );
+        continue;
+      }
       const text2 = sourceNet.name;
       const center2 = computeSchematicNetLabelCenter({
         anchor_position,
         anchor_side,
         text: text2
       });
-      db.schematic_net_label.insert({
+      const netLabel2 = {
         text: text2,
+        source_net_id: sourceNet.source_net_id,
         anchor_position,
         center: center2,
-        anchor_side,
-        ...sourceNet?.source_net_id ? { source_net_id: sourceNet.source_net_id } : {}
-      });
+        anchor_side
+      };
+      db.schematic_net_label.insert(netLabel2);
       continue;
     }
-    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementSck);
+    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementConnKey);
     const { name: text, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
     if (!wasAssignedDisplayLabel && (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) <= 1 && schPortIds.some(
       (schPortId) => schematicPortIdsWithRoutedTraces.has(schPortId)
@@ -18147,26 +18185,25 @@ function applyNetLabelPlacements(args) {
       anchor_side,
       text
     });
-    db.schematic_net_label.insert({
+    const netLabel = {
       text,
+      source_net_id: placementConnKey ?? placement.netId ?? placement.globalConnNetId,
       anchor_position,
       center,
       anchor_side
-    });
+    };
+    db.schematic_net_label.insert(netLabel);
   }
 }
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/insertNetLabelsForTracesExcludedFromRouting.ts
-import "@tscircuit/schematic-trace-solver";
-
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/insertNetLabelsForPortsMissingTrace.ts
+var NEAR_EXISTING_NET_LABEL_DISTANCE = 0.5;
+var SAME_ANCHOR_POSITION_DISTANCE = 0.1;
 var insertNetLabelsForPortsMissingTrace = ({
   allSourceAndSchematicPortIdsInScope,
   group,
   schPortIdToSourcePortId,
-  sckToSourceNet: connKeyToNet,
-  pinIdToSchematicPortId,
-  schematicPortIdsWithPreExistingNetLabels
+  connKeyToSourceNet
 }) => {
   const { db } = group.root;
   for (const schOrSrcPortId of Array.from(
@@ -18178,37 +18215,87 @@ var insertNetLabelsForPortsMissingTrace = ({
     const srcPortId = schPortIdToSourcePortId.get(schOrSrcPortId);
     if (!srcPortId) continue;
     const sourcePort = db.source_port.get(srcPortId);
-    const key = sourcePort?.subcircuit_connectivity_map_key;
-    if (!key) continue;
-    const sourceNet = connKeyToNet.get(key);
+    const connKey = sourcePort?.subcircuit_connectivity_map_key;
+    if (!connKey) continue;
+    const sourceNet = connKeyToSourceNet.get(connKey);
     if (!sourceNet) {
       continue;
     }
-    const existingAtPort = db.schematic_net_label.list().some((nl) => {
-      const samePos = Math.abs(nl.anchor_position.x - schPort.center.x) < 0.1 && Math.abs(nl.anchor_position.y - schPort.center.y) < 0.1;
-      if (!samePos) return false;
-      if (sourceNet.source_net_id && nl.source_net_id) {
-        return nl.source_net_id === sourceNet.source_net_id;
-      }
-      return nl.text === (sourceNet.name || key);
-    });
-    if (existingAtPort) continue;
-    const text = sourceNet.name || sourceNet.source_net_id || key;
-    const side = getEnteringEdgeFromDirection(
-      schPort.facing_direction || "right"
-    ) || "right";
+    const text = sourceNet.name || sourceNet.source_net_id || connKey;
+    const connectedPortCountForKey = Array.from(
+      allSourceAndSchematicPortIdsInScope
+    ).filter((portId) => {
+      const sourcePortId = schPortIdToSourcePortId.get(portId);
+      if (!sourcePortId) return false;
+      return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
+    }).length;
+    const isGndNet = sourceNet.is_ground;
+    const isPowerNet = !isGndNet && sourceNet.is_power;
+    const usePowerSymbolSide = connectedPortCountForKey > 1;
+    let side;
+    if (usePowerSymbolSide && isGndNet) {
+      side = "top";
+    } else if (usePowerSymbolSide && isPowerNet) {
+      side = "bottom";
+    } else {
+      side = getEnteringEdgeFromDirection(
+        schPort.facing_direction || "right"
+      ) || "right";
+    }
     const center = computeSchematicNetLabelCenter({
       anchor_position: schPort.center,
       anchor_side: side,
       text
     });
-    db.schematic_net_label.insert({
+    const sameNetLabel = db.schematic_net_label.list().find((nl) => {
+      if (sourceNet.source_net_id && nl.source_net_id) {
+        return nl.source_net_id === sourceNet.source_net_id;
+      }
+      return nl.text === (sourceNet.name || connKey);
+    });
+    if (sameNetLabel && connectedPortCountForKey <= 1) {
+      db.schematic_net_label.update(sameNetLabel.schematic_net_label_id, {
+        text,
+        anchor_position: schPort.center,
+        center,
+        anchor_side: side
+      });
+      continue;
+    }
+    if (sameNetLabel) {
+      const dx = sameNetLabel.anchor_position.x - schPort.center.x;
+      const dy = sameNetLabel.anchor_position.y - schPort.center.y;
+      const labelIsNearPort = dx * dx + dy * dy < NEAR_EXISTING_NET_LABEL_DISTANCE * NEAR_EXISTING_NET_LABEL_DISTANCE;
+      if (labelIsNearPort && sourceNet.is_ground) {
+        db.schematic_net_label.update(sameNetLabel.schematic_net_label_id, {
+          text,
+          anchor_position: schPort.center,
+          center,
+          anchor_side: side
+        });
+        continue;
+      }
+      const existingAtPort = db.schematic_net_label.list().some((nl) => {
+        const dx2 = nl.anchor_position.x - schPort.center.x;
+        const dy2 = nl.anchor_position.y - schPort.center.y;
+        if (dx2 * dx2 + dy2 * dy2 >= SAME_ANCHOR_POSITION_DISTANCE * SAME_ANCHOR_POSITION_DISTANCE) {
+          return false;
+        }
+        if (sourceNet.source_net_id && nl.source_net_id) {
+          return nl.source_net_id === sourceNet.source_net_id;
+        }
+        return nl.text === (sourceNet.name || connKey);
+      });
+      if (existingAtPort) continue;
+    }
+    const netLabel = {
       text,
+      source_net_id: sourceNet.source_net_id,
       anchor_position: schPort.center,
       center,
-      anchor_side: side,
-      ...sourceNet.source_net_id ? { source_net_id: sourceNet.source_net_id } : {}
-    });
+      anchor_side: side
+    };
+    db.schematic_net_label.insert(netLabel);
   }
 };
 
@@ -18256,13 +18343,11 @@ var Group_doInitialSchematicTraceRender = (group) => {
   const {
     inputProblem,
     pinIdToSchematicPortId,
-    pairKeyToSourceTraceId,
-    sckToSourceNet,
+    connKeyToSourceNet,
     allSourceAndSchematicPortIdsInScope,
     schPortIdToSourcePortId,
-    displayLabelTraces,
-    allScks,
-    userNetIdToSck
+    userNetIdToConnKey,
+    connKeysWithExplicitPortNetTraces
   } = createSchematicTraceSolverInputProblem(group);
   if (inputProblem.chips.length === 0) return;
   const schematicPortIdsWithPreExistingNetLabels = getSchematicPortIdsWithAssignedNetLabels(group);
@@ -18272,9 +18357,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
       group,
       allSourceAndSchematicPortIdsInScope,
       schPortIdToSourcePortId,
-      sckToSourceNet,
-      pinIdToSchematicPortId,
-      schematicPortIdsWithPreExistingNetLabels
+      connKeyToSourceNet
     });
     return;
   }
@@ -18285,7 +18368,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
       content: JSON.stringify(inputProblem, null, 2)
     });
   }
-  const solver = new SchematicTracePipelineSolver4(inputProblem);
+  const solver = new SchematicTracePipelineSolver3(inputProblem);
   solver.solve();
   const schematicPortIdsWithRoutedTraces = getSchematicPortIdsWithRoutedTraces({
     solver,
@@ -18295,17 +18378,16 @@ var Group_doInitialSchematicTraceRender = (group) => {
     group,
     solver,
     pinIdToSchematicPortId,
-    userNetIdToSck
+    userNetIdToConnKey,
+    schematicPortIdsWithPreExistingNetLabels
   });
   applyNetLabelPlacements({
     group,
     solver,
-    sckToSourceNet,
-    allSourceAndSchematicPortIdsInScope,
-    schPortIdToSourcePortId,
+    connKeyToSourceNet,
     pinIdToSchematicPortId,
-    allScks,
-    userNetIdToSck,
+    userNetIdToConnKey,
+    connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
     schematicPortIdsWithRoutedTraces
   });
@@ -18313,9 +18395,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
     group,
     allSourceAndSchematicPortIdsInScope,
     schPortIdToSourcePortId,
-    sckToSourceNet,
-    pinIdToSchematicPortId,
-    schematicPortIdsWithPreExistingNetLabels
+    connKeyToSourceNet
   });
 };
 
@@ -19202,9 +19282,13 @@ function getExistingPcbTracesForReroute(group) {
 function addPossibleReplacementSourceTraceId(sourceTraceIds, value) {
   if (typeof value !== "string" || value.length === 0) return;
   sourceTraceIds.add(value);
-  const rerouteSuffixIndex = value.indexOf("_reroute_");
-  if (rerouteSuffixIndex > 0) {
-    sourceTraceIds.add(value.slice(0, rerouteSuffixIndex));
+  for (const connectionNamePart of value.split("__")) {
+    if (connectionNamePart.length === 0) continue;
+    sourceTraceIds.add(connectionNamePart);
+    const rerouteSuffixIndex = connectionNamePart.indexOf("_reroute_");
+    if (rerouteSuffixIndex > 0) {
+      sourceTraceIds.add(connectionNamePart.slice(0, rerouteSuffixIndex));
+    }
   }
 }
 function deleteExistingPcbTracesReplacedBy({
@@ -19348,7 +19432,7 @@ function computeCenterFromAnchorPosition(anchorPosition, ctx) {
 }
 
 // lib/components/primitive-components/Group/Group.ts
-var Group6 = class extends NormalComponent3 {
+var Group5 = class extends NormalComponent3 {
   pcb_group_id = null;
   schematic_group_id = null;
   subcircuit_id = null;
@@ -20555,7 +20639,7 @@ function inflateSourceGroup(sourceGroup, inflatorContext) {
   if (pcbGroup?.anchor_alignment) {
     groupProps2.pcbAnchorAlignment = pcbGroup.anchor_alignment;
   }
-  const group = new Group6(groupProps2);
+  const group = new Group5(groupProps2);
   group._isInflatedFromCircuitJson = true;
   group.source_group_id = sourceGroup.source_group_id;
   if (groupsMap) {
@@ -21243,7 +21327,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1245",
+  version: "0.0.1247",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21291,7 +21375,7 @@ var package_default = {
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
     "@tscircuit/props": "^0.0.531",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
-    "@tscircuit/schematic-trace-solver": "^0.0.55",
+    "@tscircuit/schematic-trace-solver": "^0.0.57",
     "@tscircuit/solver-utils": "^0.0.3",
     "@tscircuit/soup-util": "^0.0.41",
     "@types/bun": "^1.2.16",
@@ -21488,7 +21572,7 @@ var IsolatedCircuit = class {
       this.firstChild = this.children[0];
       return;
     }
-    const group = new Group6({ subcircuit: true });
+    const group = new Group5({ subcircuit: true });
     group.parent = this;
     group.addAll(this.children);
     this.children = [group];
@@ -21854,7 +21938,7 @@ var getRoundedRectOutline = (width, height, radius) => {
   }
   return outline;
 };
-var Board = class extends Group6 {
+var Board = class extends Group5 {
   pcb_board_id = null;
   source_board_id = null;
   _drcChecksComplete = false;
@@ -22297,7 +22381,7 @@ import { mountedboardProps } from "@tscircuit/props";
 
 // lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 import "@tscircuit/props";
-var Subcircuit = class extends Group6 {
+var Subcircuit = class extends Group5 {
   constructor(props) {
     super({
       ...props,
@@ -22826,7 +22910,7 @@ function getItemDimensions(item, db) {
 }
 
 // lib/components/normal-components/Subpanel.ts
-var Subpanel = class _Subpanel extends Group6 {
+var Subpanel = class _Subpanel extends Group5 {
   pcb_panel_id = null;
   _tabsAndMouseBitesGenerated = false;
   get config() {
@@ -24234,7 +24318,7 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/Breakout/Breakout.ts
 import "@tscircuit/props";
-var Breakout = class extends Group6 {
+var Breakout = class extends Group5 {
   constructor(props) {
     super({
       ...props,
@@ -24383,10 +24467,23 @@ var NetLabel = class extends PrimitiveComponent2 {
     if (props.anchorSide) return props.anchorSide;
     const connectsTo = this._resolveConnectsTo();
     if (!connectsTo) return "right";
+    const net = this.getSubcircuit().selectOne(
+      `net.${this._getNetName()}`
+    );
+    let sourceNet;
+    if (net?.source_net_id) {
+      sourceNet = this.root?.db.source_net.get(net.source_net_id);
+    }
+    if (sourceNet?.is_ground) return "top";
+    if (sourceNet?.is_power) return "bottom";
     const anchorPos = this._getGlobalSchematicPositionBeforeLayout();
     const connectedPorts = this._getConnectedPorts();
     if (connectedPorts.length === 0) return "right";
-    const connectedPortPosition = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
+    const port = connectedPorts[0];
+    if (port.facingDirection) {
+      return getEnteringEdgeFromDirection(port.facingDirection);
+    }
+    const connectedPortPosition = port._getGlobalSchematicPositionBeforeLayout();
     const dx = connectedPortPosition.x - anchorPos.x;
     const dy = connectedPortPosition.y - anchorPos.y;
     if (Math.abs(dx) > Math.abs(dy)) {
@@ -24434,7 +24531,7 @@ var NetLabel = class extends PrimitiveComponent2 {
     const net = this.getSubcircuit().selectOne(
       `net.${this._getNetName()}`
     );
-    const anchorSide = props.anchorSide ?? "right";
+    const anchorSide = this._getAnchorSide();
     const center = computeSchematicNetLabelCenter({
       anchor_position: anchorPos,
       anchor_side: anchorSide,
@@ -24445,7 +24542,7 @@ var NetLabel = class extends PrimitiveComponent2 {
       source_net_id: net.source_net_id,
       anchor_position: anchorPos,
       center,
-      anchor_side: this._getAnchorSide()
+      anchor_side: anchorSide
     });
     this.source_net_label_id = netLabel.source_net_id;
   }
@@ -25903,26 +26000,46 @@ var Mosfet = class extends NormalComponent3 {
 // lib/components/normal-components/OpAmp.ts
 import { opampProps } from "@tscircuit/props";
 var OpAmp = class extends NormalComponent3 {
-  get config() {
+  getSchematicSymbolName() {
+    if (this.props.symbolName) {
+      return this.props.symbolName;
+    }
     const hasPowerConnections = this.props.connections?.positive_supply || this.props.connections?.negative_supply;
-    const symbolName = this.props.symbolName ? this.props.symbolName : hasPowerConnections ? "opamp_with_power" : "opamp_no_power";
+    if (hasPowerConnections) {
+      return "opamp_with_power";
+    }
+    return "opamp_no_power";
+  }
+  get config() {
     return {
       componentName: "OpAmp",
-      schematicSymbolName: symbolName,
+      schematicSymbolName: this.getSchematicSymbolName(),
       zodProps: opampProps,
       sourceFtype: "simple_op_amp"
     };
   }
   initPorts() {
-    super.initPorts({
-      pinCount: 5,
-      additionalAliases: {
-        pin1: ["non_inverting_input"],
-        pin2: ["inverting_input"],
+    const additionalAliases = {
+      pin1: ["non_inverting_input"],
+      pin2: ["inverting_input"]
+    };
+    const hasPowerSymbol = this.getSchematicSymbolName() === "opamp_with_power";
+    if (hasPowerSymbol) {
+      Object.assign(additionalAliases, {
+        pin4: ["output"],
+        pin5: ["positive_supply", "vcc", "vdd"],
+        pin3: ["negative_supply", "vee", "vss", "gnd"]
+      });
+    } else {
+      Object.assign(additionalAliases, {
         pin3: ["output"],
         pin4: ["positive_supply", "vcc", "vdd"],
         pin5: ["negative_supply", "vee", "vss", "gnd"]
-      }
+      });
+    }
+    super.initPorts({
+      pinCount: 5,
+      additionalAliases
     });
   }
   doInitialSourceRender() {
@@ -27768,7 +27885,7 @@ export {
   Fiducial,
   Footprint,
   Fuse,
-  Group6 as Group,
+  Group5 as Group,
   Hole,
   Inductor,
   Interconnect,

package/package.json

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