@tscircuit/core 0.0.1507 → 0.0.1508

package/dist/index.js

@@ -48,7 +48,7 @@ __export(components_exports, {
   Fiducial: () => Fiducial,
   Footprint: () => Footprint,
   Fuse: () => Fuse,
-  Group: () => Group,
+  Group: () => Group3,
   Hole: () => Hole,
   Inductor: () => Inductor,
   Interconnect: () => Interconnect,
@@ -21011,397 +21011,257 @@ function Group_doInitialSchematicLayoutSections(group) {
 import { SchematicTracePipelineSolver as SchematicTracePipelineSolver4 } from "@tscircuit/schematic-trace-solver";
 import Debug12 from "debug";
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
-import {
-  getBoundFromCenteredRect as getBoundFromCenteredRect4,
-  getBoundsCenter as getBoundsCenter2
-} from "@tscircuit/math-utils";
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
+import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
 import "@tscircuit/schematic-trace-solver";
+import Debug10 from "debug";
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/schematicTextToTextBounds.ts
-import {
-  getBoundFromCenteredRect as getBoundFromCenteredRect3,
-  getBoundsCenter
-} from "@tscircuit/math-utils";
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicTextBounds.ts
-import { getBoundsFromPoints as getBoundsFromPoints4 } from "@tscircuit/math-utils";
-var DEFAULT_SCHEMATIC_TEXT_FONT_SIZE = 0.18;
-function getSchematicTextBounds(text) {
-  const fontSize = text.font_size ?? DEFAULT_SCHEMATIC_TEXT_FONT_SIZE;
-  const width = getSchematicTextWidth({
-    text: text.text ?? "",
-    fontSize
-  });
-  const height = fontSize;
-  const anchor = text.anchor ?? "center";
-  let minX;
-  let maxX;
-  if (anchor.includes("left")) {
-    minX = 0;
-    maxX = width;
-  } else if (anchor.includes("right")) {
-    minX = -width;
-    maxX = 0;
-  } else {
-    minX = -width / 2;
-    maxX = width / 2;
-  }
-  let minY;
-  let maxY;
-  if (anchor.includes("top")) {
-    minY = -height;
-    maxY = 0;
-  } else if (anchor.includes("bottom")) {
-    minY = 0;
-    maxY = height;
-  } else {
-    minY = -height / 2;
-    maxY = height / 2;
-  }
-  const rotation4 = (text.rotation ?? 0) * Math.PI / 180;
-  const cos = Math.cos(rotation4);
-  const sin = Math.sin(rotation4);
-  const corners = [
-    { x: minX, y: minY },
-    { x: minX, y: maxY },
-    { x: maxX, y: minY },
-    { x: maxX, y: maxY }
-  ].map((corner) => ({
-    x: text.position.x + corner.x * cos - corner.y * sin,
-    y: text.position.y + corner.x * sin + corner.y * cos
-  }));
-  return getBoundsFromPoints4(corners);
-}
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/schematicTextToTextBounds.ts
-var REFDES_TEXT_BOX_CHIP_OVERLAP = 0.01;
-var REFDES_TEXT_BOX_CLEARANCE = 0.06;
-function isReferenceDesignatorText(text, sourceComponent) {
-  if (!sourceComponent) return false;
-  return text.text === sourceComponent.display_name || text.text === sourceComponent.name;
-}
-function schematicTextToTextBox(text, options = {}) {
-  if (!text.text) return null;
-  const bounds = getSchematicTextBounds(text);
-  if (isReferenceDesignatorText(text, options.sourceComponent) && options.schematicComponent?.center && options.schematicComponent?.size) {
-    const componentBounds = getBoundFromCenteredRect3({
-      center: options.schematicComponent.center,
-      width: options.schematicComponent.size.width,
-      height: options.schematicComponent.size.height
-    });
-    const textHeight = bounds.maxY - bounds.minY;
-    if (bounds.minY > componentBounds.maxY) {
-      bounds.minX -= REFDES_TEXT_BOX_CLEARANCE;
-      bounds.maxX += REFDES_TEXT_BOX_CLEARANCE;
-      bounds.minY = componentBounds.maxY - REFDES_TEXT_BOX_CHIP_OVERLAP;
-      bounds.maxY = componentBounds.maxY + textHeight + REFDES_TEXT_BOX_CLEARANCE;
-    }
-  }
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetLabelTextBounds.ts
+var NET_LABEL_TEXT_HEIGHT = 0.18;
+var getNetLabelTextBounds = ({
+  center,
+  text
+}) => {
+  const width = getSchematicNetLabelTextWidth({ text });
+  const halfWidth = width / 2;
+  const halfHeight = NET_LABEL_TEXT_HEIGHT / 2;
   return {
-    chipId: text.schematic_component_id,
-    center: getBoundsCenter(bounds),
-    width: bounds.maxX - bounds.minX,
-    height: bounds.maxY - bounds.minY,
-    text: text.text
+    minX: center.x - halfWidth,
+    maxX: center.x + halfWidth,
+    minY: center.y - halfHeight,
+    maxY: center.y + halfHeight
   };
-}
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortSelector.ts
-var getSchematicPortSelector = ({
-  componentName,
-  schematicPort,
-  sourcePort
-}) => {
-  const pinIdentifier = schematicPort.pin_number ?? sourcePort?.name ?? sourcePort?.port_hints?.[0];
-  return `${componentName}.${pinIdentifier ?? schematicPort.schematic_port_id}`;
 };
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
-var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
-var SCHEMATIC_RAIL_NET_LABEL_HEIGHT = 0.42;
-function createSchematicTraceSolverInputProblem(group, opts = {}) {
-  const { db } = group.root;
-  const connKeyToSourceNet = /* @__PURE__ */ new Map();
-  const childGroups = [];
-  const componentsToVisit = [...group.children].reverse();
-  while (componentsToVisit.length > 0) {
-    const child = componentsToVisit.pop();
-    if (child instanceof Group) {
-      if (child.isSubcircuit) {
-        if (child._parsedProps.showAsSchematicBox) childGroups.push(child);
-        continue;
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetNameFromPorts.ts
+var getNetNameFromPorts = (ports) => {
+  for (const port of ports) {
+    const traces = port._getDirectlyConnectedTraces();
+    for (const trace of traces) {
+      const displayLabel = trace._getSchematicNetLabelText();
+      if (displayLabel) {
+        return { name: displayLabel, wasAssignedDisplayLabel: true };
       }
-      childGroups.push(child);
     }
-    componentsToVisit.push(...[...child.children].reverse());
   }
-  const allSchematicGroupIds = [
-    group.schematic_group_id,
-    ...childGroups.map((a) => a.schematic_group_id)
-  ];
-  const schematicComponents = db.schematic_component.list().filter((a) => allSchematicGroupIds.includes(a.schematic_group_id)).filter(
-    (schematicComponent) => opts.schematicSheetId === void 0 || schematicComponent.schematic_sheet_id === opts.schematicSheetId
-  );
-  const schematicComponentIds = new Set(
-    schematicComponents.map((component) => component.schematic_component_id)
-  );
-  const schematicComponentsById = new Map(
-    schematicComponents.map((component) => [
-      component.schematic_component_id,
-      component
-    ])
-  );
-  const textBoxes = db.schematic_text.list().filter(
-    (text) => text.schematic_component_id && schematicComponentIds.has(text.schematic_component_id)
-  ).map((text) => {
-    const schematicComponent = schematicComponentsById.get(
-      text.schematic_component_id
-    );
-    if (!schematicComponent) return;
-    const sourceComponent = db.source_component.get(
-      schematicComponent.source_component_id
-    );
-    return schematicTextToTextBox(text, {
-      schematicComponent,
-      sourceComponent
-    });
-  }).filter((textBox) => Boolean(textBox));
-  const sectionIdBySchematicComponentId = /* @__PURE__ */ new Map();
-  for (const component of group.getDescendants()) {
-    const schematicComponentId = component.schematic_component_id;
-    const sectionId = component.getSchematicSectionName();
-    if (schematicComponentId && sectionId) {
-      sectionIdBySchematicComponentId.set(schematicComponentId, sectionId);
-    }
-  }
-  const chips = [];
-  const pinIdToSchematicPortId = /* @__PURE__ */ new Map();
-  const schematicPortIdToPinId = /* @__PURE__ */ new Map();
-  for (const schematicComponent of schematicComponents) {
-    const chipId = schematicComponent.schematic_component_id;
-    const pins = [];
-    const sourceComponent = db.source_component.getWhere({
-      source_component_id: schematicComponent.source_component_id
-    });
-    const schematicPorts = db.schematic_port.list({
-      schematic_component_id: schematicComponent.schematic_component_id
-    });
-    for (const schematicPort of schematicPorts) {
-      const sourcePort = db.source_port.get(schematicPort.source_port_id);
-      const selector = getSchematicPortSelector({
-        componentName: sourceComponent?.name ?? schematicComponent.schematic_component_id,
-        schematicPort,
-        sourcePort
-      });
-      pinIdToSchematicPortId.set(selector, schematicPort.schematic_port_id);
-      schematicPortIdToPinId.set(schematicPort.schematic_port_id, selector);
-    }
-    for (const schematicPort of schematicPorts) {
-      const pinId = schematicPortIdToPinId.get(schematicPort.schematic_port_id);
-      pins.push({
-        pinId,
-        x: schematicPort.center.x,
-        y: schematicPort.center.y,
-        // Pass the port's true facing direction (known from the schematic
-        // symbol). The chip box handed to the solver is text-inclusive, so for
-        // small parts with a large reference designator the pins sit inside the
-        // box. The solver snaps such pins to the box edge along this facing
-        // direction (rather than guessing from geometry, which would pick the
-        // wrong edge for a resistor whose ref text widened the box).
-        _facingDirection: convertFacingDirectionToElbowDirection(
-          schematicPort.facing_direction ?? null
-        )
-      });
-    }
-    const sectionId = sectionIdBySchematicComponentId.get(
-      schematicComponent.schematic_component_id
-    );
-    const layoutBounds = getSchematicComponentWithTextBounds({ db, schematicComponent }) ?? getBoundFromCenteredRect4({
-      center: schematicComponent.center,
-      width: schematicComponent.size.width,
-      height: schematicComponent.size.height
-    });
-    chips.push({
-      chipId,
-      center: getBoundsCenter2(layoutBounds),
-      width: layoutBounds.maxX - layoutBounds.minX,
-      height: layoutBounds.maxY - layoutBounds.minY,
-      pins,
-      sectionId
-    });
+  const db = ports.find((port) => port.root)?.root?.db;
+  const sourcePortIds = ports.map((port) => port.source_port_id).filter((sourcePortId) => Boolean(sourcePortId));
+  const netName = db ? getNetNameFromSourcePorts(db, sourcePortIds) : ports.map((port) => port._getNetLabelText()).filter((name) => Boolean(name)).sort(
+    (a, b) => a.localeCompare(b, void 0, { numeric: true, sensitivity: "base" })
+  )[0];
+  return { name: netName ?? "", wasAssignedDisplayLabel: false };
+};
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/oppositeSide.ts
+var oppositeSide = (input) => {
+  switch (input) {
+    case "x+":
+      return "left";
+    case "x-":
+      return "right";
+    case "y+":
+      return "bottom";
+    case "y-":
+      return "top";
+    case "left":
+      return "right";
+    case "top":
+      return "bottom";
+    case "right":
+      return "left";
+    case "bottom":
+      return "top";
   }
-  const allSourceAndSchematicPortIdsInScope = /* @__PURE__ */ new Set();
-  const schPortIdToSourcePortId = /* @__PURE__ */ new Map();
-  const sourcePortIdToSchPortId = /* @__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
-    });
-    for (const sp of ports) {
-      allSourceAndSchematicPortIdsInScope.add(sp.schematic_port_id);
-      if (sp.source_port_id) {
-        schPortIdToSourcePortId.set(sp.schematic_port_id, sp.source_port_id);
-        sourcePortIdToSchPortId.set(sp.source_port_id, sp.schematic_port_id);
-      }
-    }
+};
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
+var debug8 = Debug10("Group_doInitialSchematicTraceRender");
+var isSameNet = (label, sourceNet) => label.source_net_id != null && label.source_net_id === sourceNet.source_net_id;
+var isUserDefinedNetLabelRedundantWithPlacement = (label, solverPlacement) => {
+  if (!isSameNet(label, solverPlacement.sourceNet)) {
+    return false;
   }
-  const allowedSubcircuitIds = /* @__PURE__ */ new Set();
-  if (group.subcircuit_id) allowedSubcircuitIds.add(group.subcircuit_id);
-  for (const cg of childGroups) {
-    if (cg.subcircuit_id) allowedSubcircuitIds.add(cg.subcircuit_id);
+  if (label.schematicPortIds.some(
+    (id) => solverPlacement.schematicPortIds.has(id)
+  )) {
+    return true;
   }
-  const tracesInScope = db.source_trace.list().filter((st) => {
-    if (st.subcircuit_id === group.subcircuit_id) return true;
-    for (const source_port_id of st.connected_source_port_ids) {
-      if (sourcePortIdToSchPortId.has(source_port_id)) return true;
-    }
-    return false;
-  });
-  const externalNetIds = tracesInScope.flatMap(
-    (st) => st.connected_source_net_ids
+  if (!label.center) return false;
+  return doBoundsOverlap2(
+    getNetLabelTextBounds({ center: label.center, text: label.text }),
+    solverPlacement.bounds
   );
-  for (const netId of externalNetIds) {
-    const net = db.source_net.get(netId);
-    if (net?.subcircuit_id) {
-      allowedSubcircuitIds.add(net.subcircuit_id);
+};
+function applyNetLabelPlacements(args) {
+  const {
+    group,
+    solver,
+    connKeyToSourceNet,
+    userNetIdToConnKey,
+    pinIdToSchematicPortId,
+    connKeysWithExplicitPortNetTraces,
+    schematicPortIdsWithPreExistingNetLabels,
+    schematicPortIdsWithRoutedTraces
+  } = args;
+  const { db } = group.root;
+  const netLabelPlacements = solver.netLabelNetLabelCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelTraceCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelPlacementSolver?.netLabelPlacements ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().netLabelPlacements ?? [];
+  const dedupedNetLabelPlacements = [];
+  const netLabelPlacementKeys = /* @__PURE__ */ new Set();
+  for (const placement of netLabelPlacements) {
+    const pinIds = [...placement.pinIds ?? []].sort();
+    const key = `${placement.globalConnNetId}|${pinIds.join("::")}|${placement.netId ?? ""}`;
+    if (netLabelPlacementKeys.has(key)) {
+      debug8(
+        `skipping duplicate placement for "${placement.netId}" REASON:identical net label placement`
+      );
+      continue;
     }
+    netLabelPlacementKeys.add(key);
+    dedupedNetLabelPlacements.push(placement);
   }
-  const directConnections = [];
-  const connectedPairKeys = /* @__PURE__ */ new Set();
-  const connKeysWithExplicitPortNetTraces = /* @__PURE__ */ new Set();
-  for (const sourceTrace of tracesInScope) {
-    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
-      );
+  const netLabelPlacementCountByGlobalNetId = /* @__PURE__ */ new Map();
+  const routedPairKeysByGlobalNetId = /* @__PURE__ */ new Map();
+  const globalNetIdsWithPortOnlyPlacements = /* @__PURE__ */ new Set();
+  for (const placement of dedupedNetLabelPlacements) {
+    netLabelPlacementCountByGlobalNetId.set(
+      placement.globalConnNetId,
+      (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) + 1
+    );
+    if ((placement.pinIds?.length ?? 0) > 1) {
+      if (!routedPairKeysByGlobalNetId.has(placement.globalConnNetId)) {
+        routedPairKeysByGlobalNetId.set(placement.globalConnNetId, /* @__PURE__ */ new Set());
+      }
+      routedPairKeysByGlobalNetId.get(placement.globalConnNetId).add(placement.pinIds.slice().sort().join("::"));
+    }
+    if ((placement.pinIds?.length ?? 0) <= 1) {
+      globalNetIdsWithPortOnlyPlacements.add(placement.globalConnNetId);
     }
   }
-  for (const st of db.source_trace.list()) {
-    if (st.subcircuit_id && !allowedSubcircuitIds.has(st.subcircuit_id)) {
-      continue;
+  const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
+  const userDefinedNetLabels = group.selectAll("netlabel").map((label) => {
+    if (!label.schematic_net_label_id) return null;
+    const dbLabel = db.schematic_net_label.get(label.schematic_net_label_id);
+    if (!dbLabel) return null;
+    return {
+      ...dbLabel,
+      schematicPortIds: label._getConnectedPorts().map((port) => port.schematic_port_id).filter((id) => Boolean(id))
+    };
+  }).filter((label) => label !== null);
+  for (const placement of dedupedNetLabelPlacements) {
+    debug8(`processing placement: ${placement.netId}`);
+    const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
+    const placementConnKey = userNetIdToConnKey.get(placementUserNetId);
+    const orientation = placement.orientation;
+    const anchor_side = oppositeSide(orientation);
+    let sourceNet;
+    if (placementConnKey) {
+      sourceNet = connKeyToSourceNet.get(placementConnKey);
     }
-    const connected = (st.connected_source_port_ids ?? []).map((sourcePortId) => sourcePortIdToSchPortId.get(sourcePortId)).filter(
-      (schematicPortId) => Boolean(schematicPortId) && allSourceAndSchematicPortIdsInScope.has(schematicPortId)
+    const schPortIds = placement.pinIds.map(
+      (pinId) => pinIdToSchematicPortId.get(pinId)
     );
-    if (connected.length >= 2) {
-      const [a, b] = connected.slice(0, 2);
-      const pairKey = [a, b].sort().join("::");
-      if (!connectedPairKeys.has(pairKey)) {
-        connectedPairKeys.add(pairKey);
-        const traceLabel = st.name ?? st.display_name;
-        const userNetId = traceLabel ?? st.source_trace_id;
-        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 (traceLabel && !traceLabel.startsWith(".") && portDistance > maxMspDist) {
-          netLabelWidth = Number(
-            getSchematicNetLabelTextWidth({
-              text: String(traceLabel),
-              font_size: 0.14
-            }).toFixed(2)
-          );
-        }
-        directConnections.push({
-          pinIds: [a, b].map((id) => schematicPortIdToPinId.get(id)),
-          netId: userNetId,
-          netLabelWidth
-        });
+    let schematicSheetId = group._resolveSchematicSheetId();
+    const schematicPort = db.schematic_port.get(schPortIds[0]);
+    if (schematicPort?.schematic_sheet_id) {
+      schematicSheetId = schematicPort.schematic_sheet_id;
+    }
+    let anchor_position = placement.anchorPoint;
+    if (schPortIds.length === 1 && schPortIds[0]) {
+      const anchorSchPort = db.schematic_port.get(schPortIds[0]);
+      if (anchorSchPort?.center && !anchorSchPort.is_connected) {
+        anchor_position = anchorSchPort.center;
       }
     }
-  }
-  const netConnections = [];
-  for (const net of db.source_net.list().filter(
-    (n) => !n.subcircuit_id || allowedSubcircuitIds.has(n.subcircuit_id)
-  )) {
-    if (net.subcircuit_connectivity_map_key) {
-      connKeyToSourceNet.set(net.subcircuit_connectivity_map_key, net);
+    if (schPortIds.some(
+      (schPortId) => schematicPortIdsWithPreExistingNetLabels.has(schPortId)
+    )) {
+      debug8(
+        `skipping net label placement for "${placement.netId}" REASON:schematic port has pre-existing net label`
+      );
+      continue;
     }
-  }
-  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 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 || connKey
+    if (sourceNet) {
+      const isPowerOrGroundNet = sourceNet.is_ground || sourceNet.is_power;
+      const hasExplicitPortNetTrace = connKeysWithExplicitPortNetTraces.has(
+        placementConnKey
       );
-      userNetIdToConnKey.set(userNetId, connKey);
-      const netLabelTextWidth = Number(
-        getSchematicNetLabelTextWidth({ text: String(userNetId) }).toFixed(2)
+      const hasRoutedTraceForPlacementPort = schPortIds.some(
+        (id) => schematicPortIdsWithRoutedTraces.has(id)
       );
-      let netLabelWidth = netLabelTextWidth;
-      let netLabelHeight;
-      if (sourceNet.is_ground || sourceNet.is_power) {
-        netLabelWidth = SCHEMATIC_RAIL_NET_LABEL_HEIGHT;
-        netLabelHeight = netLabelTextWidth;
+      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;
       }
-      netConnections.push({
-        netId: userNetId,
-        pinIds: schematicPortIds.map(
-          (portId) => schematicPortIdToPinId.get(portId)
-        ),
-        netLabelWidth,
-        netLabelHeight
+      const text2 = sourceNet.name;
+      const center2 = computeSchematicNetLabelCenter({
+        anchor_position,
+        anchor_side,
+        text: text2
       });
+      if (!isPowerOrGroundNet) {
+        const solverPlacement = {
+          sourceNet,
+          text: text2,
+          schematicPortIds: new Set(schPortIds),
+          bounds: getNetLabelTextBounds({ center: center2, text: text2 })
+        };
+        if (userDefinedNetLabels.some(
+          (label) => isUserDefinedNetLabelRedundantWithPlacement(label, solverPlacement)
+        )) {
+          continue;
+        }
+      }
+      const netLabel2 = {
+        text: text2,
+        source_net_id: sourceNet.source_net_id,
+        anchor_position,
+        center: center2,
+        anchor_side,
+        schematic_sheet_id: schematicSheetId
+      };
+      db.schematic_net_label.insert(netLabel2);
+      continue;
     }
-  }
-  const availableNetLabelOrientations = (() => {
-    const netToAllowedOrientations = {};
-    const presentNetIds = new Set(netConnections.map((nc) => nc.netId));
-    for (const net of db.source_net.list().filter(
-      (n) => !n.subcircuit_id || allowedSubcircuitIds.has(n.subcircuit_id)
+    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementConnKey);
+    const { name: portInstanceText, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
+    const sourcePortIdsForConnection = placementConnKey ? db.source_port.list().filter(
+      (sourcePort) => sourcePort.subcircuit_connectivity_map_key === placementConnKey
+    ).map((sourcePort) => sourcePort.source_port_id) : [];
+    const text = portInstanceText || getNetNameFromSourcePorts(db, sourcePortIdsForConnection) || "";
+    const isRoutedPairPlacement = (placement.pinIds?.length ?? 0) > 1;
+    const shouldKeepRoutedPairLabel = isRoutedPairPlacement && (globalNetIdsWithPortOnlyPlacements.has(placement.globalConnNetId) || (routedPairKeysByGlobalNetId.get(placement.globalConnNetId)?.size ?? 0) > 1);
+    if (!wasAssignedDisplayLabel && !shouldKeepRoutedPairLabel && schPortIds.some(
+      (schPortId) => schematicPortIdsWithRoutedTraces.has(schPortId)
     )) {
-      if (!net.name) continue;
-      if (!presentNetIds.has(net.name)) continue;
-      if (net.is_ground) {
-        netToAllowedOrientations[net.name] = ["y-"];
-      } else if (net.is_power) {
-        netToAllowedOrientations[net.name] = ["y+"];
-      } else {
-        netToAllowedOrientations[net.name] = ["x-", "x+"];
-      }
+      debug8(
+        `skipping net label placement for "${placement.netId}" REASON:schematic port has routed traces and no display label`
+      );
+      continue;
     }
-    return netToAllowedOrientations;
-  })();
-  const inputProblem = {
-    chips,
-    directConnections,
-    netConnections,
-    textBoxes,
-    availableNetLabelOrientations,
-    maxMspPairDistance: group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE
-  };
-  return {
-    inputProblem,
-    pinIdToSchematicPortId,
-    connKeyToSourceNet,
-    userNetIdToConnKey,
-    connKeysWithExplicitPortNetTraces,
-    allSourceAndSchematicPortIdsInScope,
-    schPortIdToSourcePortId
-  };
+    const center = computeSchematicNetLabelCenter({
+      anchor_position,
+      anchor_side,
+      text
+    });
+    const netLabel = {
+      text,
+      source_net_id: placementConnKey ?? placement.netId ?? placement.globalConnNetId,
+      anchor_position,
+      center,
+      anchor_side,
+      schematic_sheet_id: schematicSheetId
+    };
+    db.schematic_net_label.insert(netLabel);
+  }
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyTracesFromSolverOutput.ts
 import "@tscircuit/schematic-trace-solver";
+import Debug11 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/segment-intersection.ts
 var cross = (ax, ay, bx, by) => {
@@ -21743,6 +21603,25 @@ function computeJunctions(traces, opts = {}) {
   return result;
 }
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getPortForSchematicSymbolPort.ts
+var getPortForSchematicSymbolPort = (port) => {
+  const { schX, schY } = port._parsedProps;
+  if (schX !== void 0 && schY !== void 0) return port;
+  if (!port.getParentNormalComponent()?.getSchematicSymbol()) return port;
+  const internallyConnectedPorts = port._getPortsInternallyConnectedToThisPort();
+  const schematicSymbolPortDef = port.schematicSymbolPortDef ?? internallyConnectedPorts.find(
+    (connectedPort) => connectedPort.schematicSymbolPortDef
+  )?.schematicSymbolPortDef;
+  if (!schematicSymbolPortDef) return port;
+  return internallyConnectedPorts.find(
+    (connectedPort) => connectedPort.schematicSymbolPortDef === schematicSymbolPortDef
+  ) ?? port;
+};
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/port-id-types.ts
+var asSchematicPortId = (id) => id;
+var asSourcePortId = (id) => id;
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/remove-overlapping-same-net-crossing-segments.ts
 var TOL3 = 1e-6;
 function isCollinear(a, b, tol = TOL3) {
@@ -21849,8 +21728,7 @@ function removeOverlappingSameNetCrossingSegments(traces) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyTracesFromSolverOutput.ts
-import Debug10 from "debug";
-var debug8 = Debug10("Group_doInitialSchematicTraceRender");
+var debug9 = Debug11("Group_doInitialSchematicTraceRender");
 var MAX_PIN_SNAP_GAP = 1.5;
 function extendTraceEndpointsToReachPinsInsideExpandedBoundingBox(params, db) {
   const { points, schematicPortIds, eligiblePortIds } = params;
@@ -21902,6 +21780,20 @@ function applyTracesFromSolverOutput(args) {
     schematicPortIdsWithPreExistingNetLabels
   } = args;
   const { db } = group.root;
+  const schematicPortIdsByRoutedSchematicPortId = /* @__PURE__ */ new Map();
+  for (const port of group.selectAll("port")) {
+    const routedSchematicPortIdValue = getPortForSchematicSymbolPort(port).schematic_port_id;
+    const schematicPortIdValue = port.schematic_port_id;
+    if (!routedSchematicPortIdValue || !schematicPortIdValue) continue;
+    const routedSchematicPortId = asSchematicPortId(routedSchematicPortIdValue);
+    const schematicPortId = asSchematicPortId(schematicPortIdValue);
+    const schematicPortIds = schematicPortIdsByRoutedSchematicPortId.get(routedSchematicPortId) ?? [];
+    schematicPortIds.push(schematicPortId);
+    schematicPortIdsByRoutedSchematicPortId.set(
+      routedSchematicPortId,
+      schematicPortIds
+    );
+  }
   const eligiblePortIds = /* @__PURE__ */ new Set();
   for (const schematicComponent of db.schematic_component.list()) {
     if (!getSchematicComponentWithTextBounds({ db, schematicComponent })) {
@@ -21910,12 +21802,12 @@ function applyTracesFromSolverOutput(args) {
     for (const port of db.schematic_port.list({
       schematic_component_id: schematicComponent.schematic_component_id
     })) {
-      eligiblePortIds.add(port.schematic_port_id);
+      eligiblePortIds.add(asSchematicPortId(port.schematic_port_id));
     }
   }
   const traces = solver.netLabelTraceCollisionSolver?.getOutput().traces ?? solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths;
   const pendingTraces = [];
-  debug8(`Traces inside SchematicTraceSolver output: ${(traces ?? []).length}`);
+  debug9(`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));
@@ -21923,14 +21815,14 @@ function applyTracesFromSolverOutput(args) {
       (id) => schematicPortIdsWithPreExistingNetLabels.has(id)
     );
     if (isNetLabelCoveredTrace) {
-      debug8(
+      debug9(
         `Skipping solver netlabel-covered trace ${solvedTracePath?.mspPairId} because all schematic ports already have netlabels`
       );
       continue;
     }
     const points = solvedTracePath?.tracePath;
     if (!Array.isArray(points) || points.length < 2) {
-      debug8(
+      debug9(
         `Skipping trace ${solvedTracePath?.pinIds.join(",")} because it has less than 2 points`
       );
       continue;
@@ -21956,9 +21848,18 @@ function applyTracesFromSolverOutput(args) {
       const pA = pinIdToSchematicPortId.get(solvedTracePath.pins[0]?.pinId);
       const pB = pinIdToSchematicPortId.get(solvedTracePath.pins[1]?.pinId);
       if (pA && pB) {
-        for (const schPid of [pA, pB]) {
-          const existing = db.schematic_port.get(schPid);
-          if (existing) db.schematic_port.update(schPid, { is_connected: true });
+        const routedSchematicPortIds = /* @__PURE__ */ new Set([pA, pB]);
+        for (const routedSchematicPortId of routedSchematicPortIds) {
+          db.schematic_port.update(routedSchematicPortId, {
+            is_connected: true
+          });
+          for (const schematicPortId of schematicPortIdsByRoutedSchematicPortId.get(
+            routedSchematicPortId
+          ) ?? []) {
+            db.schematic_port.update(schematicPortId, {
+              is_connected: true
+            });
+          }
         }
         subcircuit_connectivity_map_key = userNetIdToConnKey.get(
           String(solvedTracePath.userNetId)
@@ -21993,322 +21894,526 @@ function applyTracesFromSolverOutput(args) {
     } else if (endpointSchematicSheetIds.size === 0) {
       schematicSheetId2 = group._resolveSchematicSheetId();
     }
-    pendingTraces.push({
-      source_trace_id,
-      edges,
-      subcircuit_connectivity_map_key,
-      schematic_sheet_id: schematicSheetId2
+    pendingTraces.push({
+      source_trace_id,
+      edges,
+      subcircuit_connectivity_map_key,
+      schematic_sheet_id: schematicSheetId2
+    });
+  }
+  debug9(
+    `Applying ${pendingTraces.length} traces from SchematicTraceSolver output`
+  );
+  const withCrossings = computeCrossings(
+    pendingTraces.map((t) => ({
+      source_trace_id: t.source_trace_id,
+      edges: t.edges,
+      connectivity_key: t.subcircuit_connectivity_map_key
+    }))
+  );
+  const existingTracesForJunctions = [];
+  const schematicSheetId = group._resolveSchematicSheetId();
+  for (const t of db.schematic_trace.list()) {
+    if (t.edges.length === 0) continue;
+    if (t.schematic_sheet_id !== schematicSheetId) continue;
+    const sourceTrace = t.source_trace_id ? db.source_trace.get(t.source_trace_id) : void 0;
+    existingTracesForJunctions.push({
+      schematic_trace_id: t.schematic_trace_id,
+      source_trace_id: t.source_trace_id ?? t.schematic_trace_id,
+      edges: t.edges,
+      connectivity_key: t.subcircuit_connectivity_map_key ?? sourceTrace?.subcircuit_connectivity_map_key
+    });
+  }
+  const tracesWithTrimmedCrossingOverlaps = removeOverlappingSameNetCrossingSegments([
+    ...withCrossings,
+    ...existingTracesForJunctions
+  ]);
+  const visibleTraces = tracesWithTrimmedCrossingOverlaps.slice(
+    0,
+    withCrossings.length
+  );
+  const visibleExistingTraces = tracesWithTrimmedCrossingOverlaps.slice(
+    withCrossings.length
+  );
+  for (const trace of visibleExistingTraces) {
+    if (!trace.schematic_trace_id) continue;
+    db.schematic_trace.update(trace.schematic_trace_id, {
+      edges: trace.edges
+    });
+  }
+  const junctionsById = computeJunctions([
+    ...visibleTraces,
+    ...visibleExistingTraces
+  ]);
+  for (const t of visibleTraces) {
+    const pendingTrace = pendingTraces.find(
+      (pendingTrace2) => pendingTrace2.source_trace_id === t.source_trace_id
+    );
+    let traceSchematicSheetId = schematicSheetId;
+    if (pendingTrace?.schematic_sheet_id) {
+      traceSchematicSheetId = pendingTrace.schematic_sheet_id;
+    }
+    db.schematic_trace.insert({
+      source_trace_id: t.source_trace_id,
+      edges: t.edges,
+      junctions: junctionsById[t.source_trace_id] ?? [],
+      subcircuit_connectivity_map_key: pendingTrace?.subcircuit_connectivity_map_key,
+      schematic_sheet_id: traceSchematicSheetId
+    });
+  }
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
+import {
+  getBoundFromCenteredRect as getBoundFromCenteredRect4,
+  getBoundsCenter as getBoundsCenter2
+} from "@tscircuit/math-utils";
+import "@tscircuit/schematic-trace-solver";
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortSelector.ts
+var getSchematicPortSelector = ({
+  componentName,
+  schematicPort,
+  sourcePort
+}) => {
+  const pinIdentifier = schematicPort.pin_number ?? sourcePort?.name ?? sourcePort?.port_hints?.[0];
+  return `${componentName}.${pinIdentifier ?? schematicPort.schematic_port_id}`;
+};
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/schematicTextToTextBounds.ts
+import {
+  getBoundFromCenteredRect as getBoundFromCenteredRect3,
+  getBoundsCenter
+} from "@tscircuit/math-utils";
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicTextBounds.ts
+import { getBoundsFromPoints as getBoundsFromPoints4 } from "@tscircuit/math-utils";
+var DEFAULT_SCHEMATIC_TEXT_FONT_SIZE = 0.18;
+function getSchematicTextBounds(text) {
+  const fontSize = text.font_size ?? DEFAULT_SCHEMATIC_TEXT_FONT_SIZE;
+  const width = getSchematicTextWidth({
+    text: text.text ?? "",
+    fontSize
+  });
+  const height = fontSize;
+  const anchor = text.anchor ?? "center";
+  let minX;
+  let maxX;
+  if (anchor.includes("left")) {
+    minX = 0;
+    maxX = width;
+  } else if (anchor.includes("right")) {
+    minX = -width;
+    maxX = 0;
+  } else {
+    minX = -width / 2;
+    maxX = width / 2;
+  }
+  let minY;
+  let maxY;
+  if (anchor.includes("top")) {
+    minY = -height;
+    maxY = 0;
+  } else if (anchor.includes("bottom")) {
+    minY = 0;
+    maxY = height;
+  } else {
+    minY = -height / 2;
+    maxY = height / 2;
+  }
+  const rotation4 = (text.rotation ?? 0) * Math.PI / 180;
+  const cos = Math.cos(rotation4);
+  const sin = Math.sin(rotation4);
+  const corners = [
+    { x: minX, y: minY },
+    { x: minX, y: maxY },
+    { x: maxX, y: minY },
+    { x: maxX, y: maxY }
+  ].map((corner) => ({
+    x: text.position.x + corner.x * cos - corner.y * sin,
+    y: text.position.y + corner.x * sin + corner.y * cos
+  }));
+  return getBoundsFromPoints4(corners);
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/schematicTextToTextBounds.ts
+var REFDES_TEXT_BOX_CHIP_OVERLAP = 0.01;
+var REFDES_TEXT_BOX_CLEARANCE = 0.06;
+function isReferenceDesignatorText(text, sourceComponent) {
+  if (!sourceComponent) return false;
+  return text.text === sourceComponent.display_name || text.text === sourceComponent.name;
+}
+function schematicTextToTextBox(text, options = {}) {
+  if (!text.text) return null;
+  const bounds = getSchematicTextBounds(text);
+  if (isReferenceDesignatorText(text, options.sourceComponent) && options.schematicComponent?.center && options.schematicComponent?.size) {
+    const componentBounds = getBoundFromCenteredRect3({
+      center: options.schematicComponent.center,
+      width: options.schematicComponent.size.width,
+      height: options.schematicComponent.size.height
+    });
+    const textHeight = bounds.maxY - bounds.minY;
+    if (bounds.minY > componentBounds.maxY) {
+      bounds.minX -= REFDES_TEXT_BOX_CLEARANCE;
+      bounds.maxX += REFDES_TEXT_BOX_CLEARANCE;
+      bounds.minY = componentBounds.maxY - REFDES_TEXT_BOX_CHIP_OVERLAP;
+      bounds.maxY = componentBounds.maxY + textHeight + REFDES_TEXT_BOX_CLEARANCE;
+    }
+  }
+  return {
+    chipId: text.schematic_component_id,
+    center: getBoundsCenter(bounds),
+    width: bounds.maxX - bounds.minX,
+    height: bounds.maxY - bounds.minY,
+    text: text.text
+  };
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
+var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
+var SCHEMATIC_RAIL_NET_LABEL_HEIGHT = 0.42;
+function createSchematicTraceSolverInputProblem(group, opts = {}) {
+  const { db } = group.root;
+  const connKeyToSourceNet = /* @__PURE__ */ new Map();
+  const childGroups = [];
+  const componentsToVisit = [...group.children].reverse();
+  while (componentsToVisit.length > 0) {
+    const child = componentsToVisit.pop();
+    if (child instanceof Group3) {
+      if (child.isSubcircuit) {
+        if (child._parsedProps.showAsSchematicBox) childGroups.push(child);
+        continue;
+      }
+      childGroups.push(child);
+    }
+    componentsToVisit.push(...[...child.children].reverse());
+  }
+  const allSchematicGroupIds = [
+    group.schematic_group_id,
+    ...childGroups.map((a) => a.schematic_group_id)
+  ];
+  const schematicComponents = db.schematic_component.list().filter((a) => allSchematicGroupIds.includes(a.schematic_group_id)).filter(
+    (schematicComponent) => opts.schematicSheetId === void 0 || schematicComponent.schematic_sheet_id === opts.schematicSheetId
+  );
+  const schematicComponentIds = new Set(
+    schematicComponents.map((component) => component.schematic_component_id)
+  );
+  const schematicComponentsById = new Map(
+    schematicComponents.map((component) => [
+      component.schematic_component_id,
+      component
+    ])
+  );
+  const textBoxes = db.schematic_text.list().filter(
+    (text) => text.schematic_component_id && schematicComponentIds.has(text.schematic_component_id)
+  ).map((text) => {
+    const schematicComponent = schematicComponentsById.get(
+      text.schematic_component_id
+    );
+    if (!schematicComponent) return;
+    const sourceComponent = db.source_component.get(
+      schematicComponent.source_component_id
+    );
+    return schematicTextToTextBox(text, {
+      schematicComponent,
+      sourceComponent
+    });
+  }).filter((textBox) => Boolean(textBox));
+  const sectionIdBySchematicComponentId = /* @__PURE__ */ new Map();
+  for (const component of group.getDescendants()) {
+    const schematicComponentId = component.schematic_component_id;
+    const sectionId = component.getSchematicSectionName();
+    if (schematicComponentId && sectionId) {
+      sectionIdBySchematicComponentId.set(schematicComponentId, sectionId);
+    }
+  }
+  const chips = [];
+  const pinIdToSchematicPortId = /* @__PURE__ */ new Map();
+  const schematicPortIdToPinId = /* @__PURE__ */ new Map();
+  for (const schematicComponent of schematicComponents) {
+    const chipId = schematicComponent.schematic_component_id;
+    const pins = [];
+    const sourceComponent = db.source_component.getWhere({
+      source_component_id: schematicComponent.source_component_id
+    });
+    const schematicPorts = db.schematic_port.list({
+      schematic_component_id: schematicComponent.schematic_component_id
+    });
+    for (const schematicPort of schematicPorts) {
+      const sourcePort = db.source_port.get(schematicPort.source_port_id);
+      const selector = getSchematicPortSelector({
+        componentName: sourceComponent?.name ?? schematicComponent.schematic_component_id,
+        schematicPort,
+        sourcePort
+      });
+      const schematicPortId = asSchematicPortId(schematicPort.schematic_port_id);
+      pinIdToSchematicPortId.set(selector, schematicPortId);
+      schematicPortIdToPinId.set(schematicPortId, selector);
+    }
+    for (const schematicPort of schematicPorts) {
+      const pinId = schematicPortIdToPinId.get(
+        asSchematicPortId(schematicPort.schematic_port_id)
+      );
+      pins.push({
+        pinId,
+        x: schematicPort.center.x,
+        y: schematicPort.center.y,
+        // Pass the port's true facing direction (known from the schematic
+        // symbol). The chip box handed to the solver is text-inclusive, so for
+        // small parts with a large reference designator the pins sit inside the
+        // box. The solver snaps such pins to the box edge along this facing
+        // direction (rather than guessing from geometry, which would pick the
+        // wrong edge for a resistor whose ref text widened the box).
+        _facingDirection: convertFacingDirectionToElbowDirection(
+          schematicPort.facing_direction ?? null
+        )
+      });
+    }
+    const sectionId = sectionIdBySchematicComponentId.get(
+      schematicComponent.schematic_component_id
+    );
+    const layoutBounds = getSchematicComponentWithTextBounds({ db, schematicComponent }) ?? getBoundFromCenteredRect4({
+      center: schematicComponent.center,
+      width: schematicComponent.size.width,
+      height: schematicComponent.size.height
     });
-  }
-  debug8(
-    `Applying ${pendingTraces.length} traces from SchematicTraceSolver output`
-  );
-  const withCrossings = computeCrossings(
-    pendingTraces.map((t) => ({
-      source_trace_id: t.source_trace_id,
-      edges: t.edges,
-      connectivity_key: t.subcircuit_connectivity_map_key
-    }))
-  );
-  const existingTracesForJunctions = [];
-  const schematicSheetId = group._resolveSchematicSheetId();
-  for (const t of db.schematic_trace.list()) {
-    if (t.edges.length === 0) continue;
-    if (t.schematic_sheet_id !== schematicSheetId) continue;
-    const sourceTrace = t.source_trace_id ? db.source_trace.get(t.source_trace_id) : void 0;
-    existingTracesForJunctions.push({
-      schematic_trace_id: t.schematic_trace_id,
-      source_trace_id: t.source_trace_id ?? t.schematic_trace_id,
-      edges: t.edges,
-      connectivity_key: t.subcircuit_connectivity_map_key ?? sourceTrace?.subcircuit_connectivity_map_key
+    chips.push({
+      chipId,
+      center: getBoundsCenter2(layoutBounds),
+      width: layoutBounds.maxX - layoutBounds.minX,
+      height: layoutBounds.maxY - layoutBounds.minY,
+      pins,
+      sectionId
     });
   }
-  const tracesWithTrimmedCrossingOverlaps = removeOverlappingSameNetCrossingSegments([
-    ...withCrossings,
-    ...existingTracesForJunctions
-  ]);
-  const visibleTraces = tracesWithTrimmedCrossingOverlaps.slice(
-    0,
-    withCrossings.length
-  );
-  const visibleExistingTraces = tracesWithTrimmedCrossingOverlaps.slice(
-    withCrossings.length
+  const schematicPortIdsInScope = /* @__PURE__ */ new Set();
+  const schPortIdToSourcePortId = /* @__PURE__ */ new Map();
+  const sourcePortIdToSchPortId = /* @__PURE__ */ new Map();
+  const userNetIdToConnKey = /* @__PURE__ */ new Map();
+  const componentPortBySourcePortId = new Map(
+    group.selectAll("port").filter((port) => port.source_port_id).map((port) => [asSourcePortId(port.source_port_id), port])
   );
-  for (const trace of visibleExistingTraces) {
-    if (!trace.schematic_trace_id) continue;
-    db.schematic_trace.update(trace.schematic_trace_id, {
-      edges: trace.edges
+  for (const sc of schematicComponents) {
+    const ports = db.schematic_port.list({
+      schematic_component_id: sc.schematic_component_id
     });
-  }
-  const junctionsById = computeJunctions([
-    ...visibleTraces,
-    ...visibleExistingTraces
-  ]);
-  for (const t of visibleTraces) {
-    const pendingTrace = pendingTraces.find(
-      (pendingTrace2) => pendingTrace2.source_trace_id === t.source_trace_id
-    );
-    let traceSchematicSheetId = schematicSheetId;
-    if (pendingTrace?.schematic_sheet_id) {
-      traceSchematicSheetId = pendingTrace.schematic_sheet_id;
+    for (const sp of ports) {
+      const schematicPortId = asSchematicPortId(sp.schematic_port_id);
+      schematicPortIdsInScope.add(schematicPortId);
+      if (sp.source_port_id) {
+        const sourcePortId = asSourcePortId(sp.source_port_id);
+        schPortIdToSourcePortId.set(schematicPortId, sourcePortId);
+        sourcePortIdToSchPortId.set(sourcePortId, schematicPortId);
+      }
     }
-    db.schematic_trace.insert({
-      source_trace_id: t.source_trace_id,
-      edges: t.edges,
-      junctions: junctionsById[t.source_trace_id] ?? [],
-      subcircuit_connectivity_map_key: pendingTrace?.subcircuit_connectivity_map_key,
-      schematic_sheet_id: traceSchematicSheetId
-    });
   }
-}
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
-import "@tscircuit/schematic-trace-solver";
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/oppositeSide.ts
-var oppositeSide = (input) => {
-  switch (input) {
-    case "x+":
-      return "left";
-    case "x-":
-      return "right";
-    case "y+":
-      return "bottom";
-    case "y-":
-      return "top";
-    case "left":
-      return "right";
-    case "top":
-      return "bottom";
-    case "right":
-      return "left";
-    case "bottom":
-      return "top";
+  const allowedSubcircuitIds = /* @__PURE__ */ new Set();
+  if (group.subcircuit_id) allowedSubcircuitIds.add(group.subcircuit_id);
+  for (const cg of childGroups) {
+    if (cg.subcircuit_id) allowedSubcircuitIds.add(cg.subcircuit_id);
   }
-};
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetNameFromPorts.ts
-var getNetNameFromPorts = (ports) => {
-  for (const port of ports) {
-    const traces = port._getDirectlyConnectedTraces();
-    for (const trace of traces) {
-      const displayLabel = trace._getSchematicNetLabelText();
-      if (displayLabel) {
-        return { name: displayLabel, wasAssignedDisplayLabel: true };
+  const tracesInScope = db.source_trace.list().filter((st) => {
+    if (st.subcircuit_id === group.subcircuit_id) return true;
+    for (const source_port_id of st.connected_source_port_ids) {
+      if (sourcePortIdToSchPortId.has(asSourcePortId(source_port_id))) {
+        return true;
       }
     }
-  }
-  const db = ports.find((port) => port.root)?.root?.db;
-  const sourcePortIds = ports.map((port) => port.source_port_id).filter((sourcePortId) => Boolean(sourcePortId));
-  const netName = db ? getNetNameFromSourcePorts(db, sourcePortIds) : ports.map((port) => port._getNetLabelText()).filter((name) => Boolean(name)).sort(
-    (a, b) => a.localeCompare(b, void 0, { numeric: true, sensitivity: "base" })
-  )[0];
-  return { name: netName ?? "", wasAssignedDisplayLabel: false };
-};
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetLabelTextBounds.ts
-var NET_LABEL_TEXT_HEIGHT = 0.18;
-var getNetLabelTextBounds = ({
-  center,
-  text
-}) => {
-  const width = getSchematicNetLabelTextWidth({ text });
-  const halfWidth = width / 2;
-  const halfHeight = NET_LABEL_TEXT_HEIGHT / 2;
-  return {
-    minX: center.x - halfWidth,
-    maxX: center.x + halfWidth,
-    minY: center.y - halfHeight,
-    maxY: center.y + halfHeight
-  };
-};
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
-import Debug11 from "debug";
-import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
-var debug9 = Debug11("Group_doInitialSchematicTraceRender");
-var isSameNet = (label, sourceNet) => label.source_net_id != null && label.source_net_id === sourceNet.source_net_id;
-var isUserDefinedNetLabelRedundantWithPlacement = (label, solverPlacement) => {
-  if (!isSameNet(label, solverPlacement.sourceNet)) {
     return false;
-  }
-  if (label.schematicPortIds.some(
-    (id) => solverPlacement.schematicPortIds.has(id)
-  )) {
-    return true;
-  }
-  if (!label.center) return false;
-  return doBoundsOverlap2(
-    getNetLabelTextBounds({ center: label.center, text: label.text }),
-    solverPlacement.bounds
+  });
+  const externalNetIds = tracesInScope.flatMap(
+    (st) => st.connected_source_net_ids
   );
-};
-function applyNetLabelPlacements(args) {
-  const {
-    group,
-    solver,
-    connKeyToSourceNet,
-    userNetIdToConnKey,
-    pinIdToSchematicPortId,
-    connKeysWithExplicitPortNetTraces,
-    schematicPortIdsWithPreExistingNetLabels,
-    schematicPortIdsWithRoutedTraces
-  } = args;
-  const { db } = group.root;
-  const netLabelPlacements = solver.netLabelNetLabelCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelTraceCollisionSolver?.getOutput().netLabelPlacements ?? solver.netLabelPlacementSolver?.netLabelPlacements ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().netLabelPlacements ?? [];
-  const dedupedNetLabelPlacements = [];
-  const netLabelPlacementKeys = /* @__PURE__ */ new Set();
-  for (const placement of netLabelPlacements) {
-    const pinIds = [...placement.pinIds ?? []].sort();
-    const key = `${placement.globalConnNetId}|${pinIds.join("::")}|${placement.netId ?? ""}`;
-    if (netLabelPlacementKeys.has(key)) {
-      debug9(
-        `skipping duplicate placement for "${placement.netId}" REASON:identical net label placement`
-      );
-      continue;
+  for (const netId of externalNetIds) {
+    const net = db.source_net.get(netId);
+    if (net?.subcircuit_id) {
+      allowedSubcircuitIds.add(net.subcircuit_id);
     }
-    netLabelPlacementKeys.add(key);
-    dedupedNetLabelPlacements.push(placement);
   }
-  const netLabelPlacementCountByGlobalNetId = /* @__PURE__ */ new Map();
-  const routedPairKeysByGlobalNetId = /* @__PURE__ */ new Map();
-  const globalNetIdsWithPortOnlyPlacements = /* @__PURE__ */ new Set();
-  for (const placement of dedupedNetLabelPlacements) {
-    netLabelPlacementCountByGlobalNetId.set(
-      placement.globalConnNetId,
-      (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) + 1
-    );
-    if ((placement.pinIds?.length ?? 0) > 1) {
-      if (!routedPairKeysByGlobalNetId.has(placement.globalConnNetId)) {
-        routedPairKeysByGlobalNetId.set(placement.globalConnNetId, /* @__PURE__ */ new Set());
-      }
-      routedPairKeysByGlobalNetId.get(placement.globalConnNetId).add(placement.pinIds.slice().sort().join("::"));
-    }
-    if ((placement.pinIds?.length ?? 0) <= 1) {
-      globalNetIdsWithPortOnlyPlacements.add(placement.globalConnNetId);
+  const directConnections = [];
+  const connectedPairKeys = /* @__PURE__ */ new Set();
+  const connKeysWithExplicitPortNetTraces = /* @__PURE__ */ new Set();
+  for (const sourceTrace of tracesInScope) {
+    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
+      );
     }
   }
-  const globalConnMap = solver.mspConnectionPairSolver.globalConnMap;
-  const userDefinedNetLabels = group.selectAll("netlabel").map((label) => {
-    if (!label.schematic_net_label_id) return null;
-    const dbLabel = db.schematic_net_label.get(label.schematic_net_label_id);
-    if (!dbLabel) return null;
-    return {
-      ...dbLabel,
-      schematicPortIds: label._getConnectedPorts().map((port) => port.schematic_port_id).filter((id) => Boolean(id))
-    };
-  }).filter((label) => label !== null);
-  for (const placement of dedupedNetLabelPlacements) {
-    debug9(`processing placement: ${placement.netId}`);
-    const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
-    const placementConnKey = userNetIdToConnKey.get(placementUserNetId);
-    const orientation = placement.orientation;
-    const anchor_side = oppositeSide(orientation);
-    let sourceNet;
-    if (placementConnKey) {
-      sourceNet = connKeyToSourceNet.get(placementConnKey);
+  for (const st of db.source_trace.list()) {
+    if (st.subcircuit_id && !allowedSubcircuitIds.has(st.subcircuit_id)) {
+      continue;
     }
-    const schPortIds = placement.pinIds.map(
-      (pinId) => pinIdToSchematicPortId.get(pinId)
+    const connected = (st.connected_source_port_ids ?? []).map(
+      (sourcePortId) => sourcePortIdToSchPortId.get(asSourcePortId(sourcePortId))
+    ).filter(
+      (schematicPortId) => Boolean(schematicPortId) && schematicPortIdsInScope.has(schematicPortId)
     );
-    let schematicSheetId = group._resolveSchematicSheetId();
-    const schematicPort = db.schematic_port.get(schPortIds[0]);
-    if (schematicPort?.schematic_sheet_id) {
-      schematicSheetId = schematicPort.schematic_sheet_id;
-    }
-    let anchor_position = placement.anchorPoint;
-    if (schPortIds.length === 1 && schPortIds[0]) {
-      const anchorSchPort = db.schematic_port.get(schPortIds[0]);
-      if (anchorSchPort?.center && !anchorSchPort.is_connected) {
-        anchor_position = anchorSchPort.center;
+    if (connected.length >= 2) {
+      const [a, b] = connected.slice(0, 2);
+      const pairKey = [a, b].sort().join("::");
+      if (!connectedPairKeys.has(pairKey)) {
+        connectedPairKeys.add(pairKey);
+        const traceLabel = st.name ?? st.display_name;
+        const userNetId = traceLabel ?? st.source_trace_id;
+        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 (traceLabel && !traceLabel.startsWith(".") && portDistance > maxMspDist) {
+          netLabelWidth = Number(
+            getSchematicNetLabelTextWidth({
+              text: String(traceLabel),
+              font_size: 0.14
+            }).toFixed(2)
+          );
+        }
+        directConnections.push({
+          pinIds: [a, b].map((id) => schematicPortIdToPinId.get(id)),
+          netId: userNetId,
+          netLabelWidth
+        });
       }
     }
-    if (schPortIds.some(
-      (schPortId) => schematicPortIdsWithPreExistingNetLabels.has(schPortId)
-    )) {
-      debug9(
-        `skipping net label placement for "${placement.netId}" REASON:schematic port has pre-existing net label`
-      );
-      continue;
+  }
+  const netConnections = [];
+  for (const net of db.source_net.list().filter(
+    (n) => !n.subcircuit_id || allowedSubcircuitIds.has(n.subcircuit_id)
+  )) {
+    if (net.subcircuit_connectivity_map_key) {
+      connKeyToSourceNet.set(net.subcircuit_connectivity_map_key, net);
     }
-    if (sourceNet) {
-      const isPowerOrGroundNet = sourceNet.is_ground || sourceNet.is_power;
-      const hasExplicitPortNetTrace = connKeysWithExplicitPortNetTraces.has(
-        placementConnKey
+  }
+  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 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 seenRoutedSchematicPortIds = /* @__PURE__ */ new Set();
+      const uniqueSchematicPortIds = schematicPortIds.filter(
+        (schematicPortId) => {
+          const sourcePortId = schPortIdToSourcePortId.get(schematicPortId);
+          const componentPort = sourcePortId ? componentPortBySourcePortId.get(sourcePortId) : void 0;
+          const routedSchematicPortIdValue = componentPort ? getPortForSchematicSymbolPort(componentPort).schematic_port_id : null;
+          const routedSchematicPortId = routedSchematicPortIdValue ? asSchematicPortId(routedSchematicPortIdValue) : schematicPortId;
+          if (seenRoutedSchematicPortIds.has(routedSchematicPortId)) {
+            return false;
+          }
+          seenRoutedSchematicPortIds.add(routedSchematicPortId);
+          return true;
+        }
       );
-      const hasRoutedTraceForPlacementPort = schPortIds.some(
-        (id) => schematicPortIdsWithRoutedTraces.has(id)
+      const userNetId = String(
+        sourceNet.name || sourceNet.source_net_id || connKey
       );
-      const hasSingleLabelPlacement = (netLabelPlacementCountByGlobalNetId.get(placement.globalConnNetId) ?? 0) <= 1;
-      const shouldSkipImplicitSignalNetLabel = !hasExplicitPortNetTrace && !isPowerOrGroundNet && hasRoutedTraceForPlacementPort && hasSingleLabelPlacement;
-      if (shouldSkipImplicitSignalNetLabel) {
-        debug9(
-          `skipping net label placement for "${placement.netId}" REASON:schematic port has routed trace`
-        );
-        continue;
+      userNetIdToConnKey.set(userNetId, connKey);
+      const netLabelTextWidth = Number(
+        getSchematicNetLabelTextWidth({ text: String(userNetId) }).toFixed(2)
+      );
+      let netLabelWidth = netLabelTextWidth;
+      let netLabelHeight;
+      if (sourceNet.is_ground || sourceNet.is_power) {
+        netLabelWidth = SCHEMATIC_RAIL_NET_LABEL_HEIGHT;
+        netLabelHeight = netLabelTextWidth;
       }
-      const text2 = sourceNet.name;
-      const center2 = computeSchematicNetLabelCenter({
-        anchor_position,
-        anchor_side,
-        text: text2
+      netConnections.push({
+        netId: userNetId,
+        pinIds: uniqueSchematicPortIds.map(
+          (portId) => schematicPortIdToPinId.get(portId)
+        ),
+        netLabelWidth,
+        netLabelHeight
       });
-      if (!isPowerOrGroundNet) {
-        const solverPlacement = {
-          sourceNet,
-          text: text2,
-          schematicPortIds: new Set(schPortIds),
-          bounds: getNetLabelTextBounds({ center: center2, text: text2 })
-        };
-        if (userDefinedNetLabels.some(
-          (label) => isUserDefinedNetLabelRedundantWithPlacement(label, solverPlacement)
-        )) {
-          continue;
-        }
-      }
-      const netLabel2 = {
-        text: text2,
-        source_net_id: sourceNet.source_net_id,
-        anchor_position,
-        center: center2,
-        anchor_side,
-        schematic_sheet_id: schematicSheetId
-      };
-      db.schematic_net_label.insert(netLabel2);
-      continue;
     }
-    const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementConnKey);
-    const { name: portInstanceText, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
-    const sourcePortIdsForConnection = placementConnKey ? db.source_port.list().filter(
-      (sourcePort) => sourcePort.subcircuit_connectivity_map_key === placementConnKey
-    ).map((sourcePort) => sourcePort.source_port_id) : [];
-    const text = portInstanceText || getNetNameFromSourcePorts(db, sourcePortIdsForConnection) || "";
-    const isRoutedPairPlacement = (placement.pinIds?.length ?? 0) > 1;
-    const shouldKeepRoutedPairLabel = isRoutedPairPlacement && (globalNetIdsWithPortOnlyPlacements.has(placement.globalConnNetId) || (routedPairKeysByGlobalNetId.get(placement.globalConnNetId)?.size ?? 0) > 1);
-    if (!wasAssignedDisplayLabel && !shouldKeepRoutedPairLabel && schPortIds.some(
-      (schPortId) => schematicPortIdsWithRoutedTraces.has(schPortId)
+  }
+  const availableNetLabelOrientations = (() => {
+    const netToAllowedOrientations = {};
+    const presentNetIds = new Set(netConnections.map((nc) => nc.netId));
+    for (const net of db.source_net.list().filter(
+      (n) => !n.subcircuit_id || allowedSubcircuitIds.has(n.subcircuit_id)
     )) {
-      debug9(
-        `skipping net label placement for "${placement.netId}" REASON:schematic port has routed traces and no display label`
+      if (!net.name) continue;
+      if (!presentNetIds.has(net.name)) continue;
+      if (net.is_ground) {
+        netToAllowedOrientations[net.name] = ["y-"];
+      } else if (net.is_power) {
+        netToAllowedOrientations[net.name] = ["y+"];
+      } else {
+        netToAllowedOrientations[net.name] = ["x-", "x+"];
+      }
+    }
+    return netToAllowedOrientations;
+  })();
+  const inputProblem = {
+    chips,
+    directConnections,
+    netConnections,
+    textBoxes,
+    availableNetLabelOrientations,
+    maxMspPairDistance: group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE
+  };
+  return {
+    inputProblem,
+    pinIdToSchematicPortId,
+    connKeyToSourceNet,
+    userNetIdToConnKey,
+    connKeysWithExplicitPortNetTraces,
+    schematicPortIdsInScope,
+    schPortIdToSourcePortId
+  };
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithAssignedNetLabels.ts
+var getSchematicPortIdsWithAssignedNetLabels = (group) => {
+  const schematicPortIdsWithNetLabels = /* @__PURE__ */ new Set();
+  const netLabels = group.selectAll("netlabel");
+  for (const netLabel of netLabels) {
+    const netLabelPorts = netLabel._getConnectedPorts();
+    for (const port of netLabelPorts) {
+      if (!port.schematic_port_id) continue;
+      schematicPortIdsWithNetLabels.add(
+        asSchematicPortId(port.schematic_port_id)
       );
-      continue;
     }
-    const center = computeSchematicNetLabelCenter({
-      anchor_position,
-      anchor_side,
-      text
-    });
-    const netLabel = {
-      text,
-      source_net_id: placementConnKey ?? placement.netId ?? placement.globalConnNetId,
-      anchor_position,
-      center,
-      anchor_side,
-      schematic_sheet_id: schematicSheetId
-    };
-    db.schematic_net_label.insert(netLabel);
   }
-}
+  return schematicPortIdsWithNetLabels;
+};
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithRoutedTraces.ts
+var getSchematicPortIdsWithRoutedTraces = ({
+  solver,
+  pinIdToSchematicPortId
+}) => {
+  const solvedTraces = solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths ?? [];
+  const schematicPortIdsWithRoutedTraces = /* @__PURE__ */ new Set();
+  for (const solvedTrace of solvedTraces) {
+    const points = solvedTrace?.tracePath;
+    if (!Array.isArray(points) || points.length < 2) continue;
+    const pinIds = Array.isArray(solvedTrace.pins) ? solvedTrace.pins.map((pin) => pin.pinId) : solvedTrace.pinIds;
+    for (const pinId of pinIds) {
+      const schPortId = pinIdToSchematicPortId.get(pinId);
+      if (schPortId) {
+        schematicPortIdsWithRoutedTraces.add(schPortId);
+      }
+    }
+  }
+  return schematicPortIdsWithRoutedTraces;
+};
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/insertNetLabelsForPortsMissingTrace.ts
 var NEAR_EXISTING_NET_LABEL_DISTANCE = 0.5;
@@ -22350,19 +22455,17 @@ var getDirectCrossSubcircuitConnectionLabelText = (db, sourcePortId) => {
   return getSourcePortNetLabelText(db, otherSourcePortId);
 };
 var insertNetLabelsForPortsMissingTrace = ({
-  allSourceAndSchematicPortIdsInScope,
+  schematicPortIdsInScope,
   group,
   schPortIdToSourcePortId,
   connKeyToSourceNet
 }) => {
   const { db } = group.root;
-  for (const schOrSrcPortId of Array.from(
-    allSourceAndSchematicPortIdsInScope
-  )) {
-    const schPort = db.schematic_port.get(schOrSrcPortId);
+  for (const schematicPortId of schematicPortIdsInScope) {
+    const schPort = db.schematic_port.get(schematicPortId);
     if (!schPort) continue;
     if (schPort.is_connected) continue;
-    const srcPortId = schPortIdToSourcePortId.get(schOrSrcPortId);
+    const srcPortId = schPortIdToSourcePortId.get(schematicPortId);
     if (!srcPortId) continue;
     const sourcePort = db.source_port.get(srcPortId);
     if (group._parsedProps.showAsSchematicBox && sourcePort?.subcircuit_id === group.subcircuit_id && !sourcePort.source_component_id && getDirectCrossSubcircuitConnectedSourcePortId(db, srcPortId)) {
@@ -22373,9 +22476,7 @@ var insertNetLabelsForPortsMissingTrace = ({
     const sourceNet = connKeyToSourceNet.get(connKey);
     const schComponent = schPort.schematic_component_id ? db.schematic_component.get(schPort.schematic_component_id) : void 0;
     const portSchematicSheetId = schComponent?.schematic_sheet_id ?? group._resolveSchematicSheetId();
-    const connectedSourcePortIdsForKey = Array.from(
-      allSourceAndSchematicPortIdsInScope
-    ).map((portId) => schPortIdToSourcePortId.get(portId)).filter((sourcePortId) => {
+    const connectedSourcePortIdsForKey = Array.from(schematicPortIdsInScope).map((portId) => schPortIdToSourcePortId.get(portId)).filter((sourcePortId) => {
       if (!sourcePortId) return false;
       return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
     });
@@ -22398,13 +22499,13 @@ var insertNetLabelsForPortsMissingTrace = ({
     );
     const hasExplicitLabel = Boolean(sourceNet || assignedPortNetLabelText);
     if (isCollapsedBoxPort && !hasExternalTrace && !hasExplicitLabel) continue;
-    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 connectedPortCountForKey = Array.from(schematicPortIdsInScope).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 ?? false;
     const isPowerNet = !isGndNet && (sourceNet?.is_power ?? false);
     let side;
@@ -22528,41 +22629,6 @@ var insertNetLabelsForPortsMissingTrace = ({
   }
 };
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithAssignedNetLabels.ts
-var getSchematicPortIdsWithAssignedNetLabels = (group) => {
-  const schematicPortIdsWithNetLabels = /* @__PURE__ */ new Set();
-  const netLabels = group.selectAll("netlabel");
-  for (const netLabel of netLabels) {
-    const netLabelPorts = netLabel._getConnectedPorts();
-    for (const port of netLabelPorts) {
-      if (!port.schematic_port_id) continue;
-      schematicPortIdsWithNetLabels.add(port.schematic_port_id);
-    }
-  }
-  return schematicPortIdsWithNetLabels;
-};
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithRoutedTraces.ts
-var getSchematicPortIdsWithRoutedTraces = ({
-  solver,
-  pinIdToSchematicPortId
-}) => {
-  const solvedTraces = solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths ?? [];
-  const schematicPortIdsWithRoutedTraces = /* @__PURE__ */ new Set();
-  for (const solvedTrace of solvedTraces) {
-    const points = solvedTrace?.tracePath;
-    if (!Array.isArray(points) || points.length < 2) continue;
-    const pinIds = Array.isArray(solvedTrace.pins) ? solvedTrace.pins.map((pin) => pin.pinId) : solvedTrace.pinIds;
-    for (const pinId of pinIds) {
-      const schPortId = pinIdToSchematicPortId.get(pinId);
-      if (schPortId) {
-        schematicPortIdsWithRoutedTraces.add(schPortId);
-      }
-    }
-  }
-  return schematicPortIdsWithRoutedTraces;
-};
-
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
 var debug10 = Debug12("Group_doInitialSchematicTraceRender");
 var renderSchematicTracesForSheet = ({
@@ -22573,7 +22639,7 @@ var renderSchematicTracesForSheet = ({
     inputProblem,
     pinIdToSchematicPortId,
     connKeyToSourceNet,
-    allSourceAndSchematicPortIdsInScope,
+    schematicPortIdsInScope,
     schPortIdToSourcePortId,
     userNetIdToConnKey,
     connKeysWithExplicitPortNetTraces
@@ -22584,7 +22650,7 @@ var renderSchematicTracesForSheet = ({
   if (!hasRouteableSchematicConnections) {
     insertNetLabelsForPortsMissingTrace({
       group,
-      allSourceAndSchematicPortIdsInScope,
+      schematicPortIdsInScope,
       schPortIdToSourcePortId,
       connKeyToSourceNet
     });
@@ -22630,7 +22696,7 @@ var renderSchematicTracesForSheet = ({
   });
   insertNetLabelsForPortsMissingTrace({
     group,
-    allSourceAndSchematicPortIdsInScope,
+    schematicPortIdsInScope,
     schPortIdToSourcePortId,
     connKeyToSourceNet
   });
@@ -22643,7 +22709,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
     [
       group,
       ...group.getDescendants().filter(
-        (component) => component instanceof Group
+        (component) => component instanceof Group3
       )
     ].map((schematicGroup) => schematicGroup.schematic_group_id).filter(
       (schematicGroupId) => Boolean(schematicGroupId)
@@ -23648,7 +23714,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1506",
+  version: "0.0.1507",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24672,7 +24738,7 @@ var ensureRouteStartsAtSourceTraceStart = ({
   const lastPoint = route[route.length - 1];
   return getDistanceToPoint(lastPoint, firstPcbPort) < getDistanceToPoint(firstPoint, firstPcbPort) ? reversePcbTraceRoute(route) : route;
 };
-var Group = class extends NormalComponent3 {
+var Group3 = class extends NormalComponent3 {
   pcb_group_id = null;
   schematic_group_id = null;
   subcircuit_id = null;
@@ -26091,7 +26157,7 @@ function inflateSourceGroup(sourceGroup, inflatorContext) {
   if (pcbGroup?.anchor_alignment) {
     groupProps2.pcbAnchorAlignment = pcbGroup.anchor_alignment;
   }
-  const group = new Group(groupProps2);
+  const group = new Group3(groupProps2);
   group._isInflatedFromCircuitJson = true;
   group.source_group_id = sourceGroup.source_group_id;
   if (groupsMap) {
@@ -27410,7 +27476,7 @@ var IsolatedCircuit = class {
       this.firstChild = this.children[0];
       return;
     }
-    const group = new Group({ subcircuit: true });
+    const group = new Group3({ subcircuit: true });
     group.parent = this;
     group.addAll(this.children);
     this.children = [group];
@@ -27816,7 +27882,7 @@ var getRoundedRectOutline = (width, height, radius) => {
   }
   return outline;
 };
-var Board = class extends Group {
+var Board = class extends Group3 {
   pcb_board_id = null;
   source_board_id = null;
   _drcChecksComplete = false;
@@ -28273,7 +28339,7 @@ import { mountedboardProps } from "@tscircuit/props";
 
 // lib/components/primitive-components/Group/Subcircuit/Subcircuit.ts
 import "@tscircuit/props";
-var Subcircuit = class extends Group {
+var Subcircuit = class extends Group3 {
   constructor(props) {
     super({
       ...props,
@@ -28845,7 +28911,7 @@ function getItemDimensions(item, db) {
 }
 
 // lib/components/normal-components/Subpanel.ts
-var Subpanel = class _Subpanel extends Group {
+var Subpanel = class _Subpanel extends Group3 {
   pcb_panel_id = null;
   _tabsAndMouseBitesGenerated = false;
   get config() {
@@ -31482,7 +31548,7 @@ var createBreakoutPointSolverInput = (breakout) => {
 };
 
 // lib/components/primitive-components/Breakout/Breakout.ts
-var Breakout = class extends Group {
+var Breakout = class extends Group3 {
   constructor(props) {
     super({
       ...props,
@@ -35360,7 +35426,7 @@ export {
   Fiducial,
   Footprint,
   Fuse,
-  Group,
+  Group3 as Group,
   Hole,
   Inductor,
   Interconnect,