@tscircuit/core 0.0.1871 → 0.0.1873

package/dist/index.js

@@ -47907,6 +47907,7 @@ var isUserDefinedNetLabelRedundantWithPlacement = (label, solverPlacement) => {
 function applyNetLabelPlacements(args) {
   const {
     group,
+    routedSchematicPortIdBySchematicPortId,
     solver,
     connKeyToSourceNet,
     userNetIdToConnKey,
@@ -47959,7 +47960,7 @@ function applyNetLabelPlacements(args) {
     if (!dbLabel) return null;
     return {
       schematicNetLabel: dbLabel,
-      schematicPortIds: label._getConnectedPorts().map((port) => port.schematic_port_id).filter((id) => Boolean(id)),
+      schematicPortIds: label._getConnectedPorts().map((port) => port.schematic_port_id).filter((id) => Boolean(id)).map((id) => routedSchematicPortIdBySchematicPortId.get(id) ?? id),
       shouldUseSchematicTraceSolver: label._parsedProps.schX === void 0 && label._parsedProps.schY === void 0
     };
   }).filter((label) => label !== null);
@@ -48447,21 +48448,6 @@ 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/remove-overlapping-same-net-crossing-segments.ts
 var TOL3 = 1e-6;
 function isCollinear(a, b, tol = TOL3) {
@@ -48628,20 +48614,6 @@ 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 customSymbolPortIds = new Set(
     group.selectAll("port").filter((port) => {
       if (!port._getSymbolAncestor()) return false;
@@ -48727,13 +48699,6 @@ function applyTracesFromSolverOutput(args) {
           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)
@@ -48928,6 +48893,40 @@ var applyInlineNetLabelEligibility = ({
   }
 };
 
+// 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/createRoutedSchematicPortIdMap.ts
+function createRoutedSchematicPortIdMap(group) {
+  const { db } = group.root;
+  const routedSchematicPortIdBySchematicPortId = /* @__PURE__ */ new Map();
+  for (const port of group.selectAll("port")) {
+    if (!port.schematic_port_id) continue;
+    const schematicPort = db.schematic_port.get(port.schematic_port_id);
+    const terminalPort = getPortForSchematicSymbolPort(port);
+    const terminalSchematicPort = terminalPort.schematic_port_id ? db.schematic_port.get(terminalPort.schematic_port_id) : void 0;
+    if (!schematicPort || !terminalSchematicPort || schematicPort.schematic_component_id !== terminalSchematicPort.schematic_component_id || schematicPort.schematic_sheet_id !== terminalSchematicPort.schematic_sheet_id)
+      continue;
+    routedSchematicPortIdBySchematicPortId.set(
+      asSchematicPortId(schematicPort.schematic_port_id),
+      asSchematicPortId(terminalSchematicPort.schematic_port_id)
+    );
+  }
+  return routedSchematicPortIdBySchematicPortId;
+}
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/resolveNetLabelForPortMissingTrace.ts
 var isDirectConnectionEndpointOutsideSchematicScope = ({
   db,
@@ -49110,6 +49109,8 @@ 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 routedSchematicPortIdBySchematicPortId = createRoutedSchematicPortIdMap(group);
+  const resolveRoutedSchematicPortId = (schematicPortId) => routedSchematicPortIdBySchematicPortId.get(schematicPortId) ?? schematicPortId;
   const sourcePortConnectivityMap = getSourcePortConnectivityMapFromCircuitJson2(
     db.toArray()
   );
@@ -49202,8 +49203,13 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     const schematicPorts = db.schematic_port.list({
       schematic_component_id: schematicComponent.schematic_component_id
     });
-    const pins = schematicPorts.map((schematicPort) => {
-      const schematicPortId = asSchematicPortId(schematicPort.schematic_port_id);
+    const pins = schematicPorts.filter((schematicPort) => {
+      const id = asSchematicPortId(schematicPort.schematic_port_id);
+      return resolveRoutedSchematicPortId(id) === id;
+    }).map((schematicPort) => {
+      const schematicPortId = asSchematicPortId(
+        schematicPort.schematic_port_id
+      );
       const sourcePort = schematicPort.source_port_id ? db.source_port.get(schematicPort.source_port_id) : void 0;
       return {
         pinId: schematicPortId,
@@ -49272,19 +49278,19 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   const schematicPortIdsWithExplicitNetLabels = new Set(
     netLabelsInScope.filter((netLabel) => !netLabel._parsedProps.inline).flatMap((netLabel) => netLabel._getConnectedPorts()).map((port) => port.schematic_port_id).filter(
       (schematicPortId) => schematicPortId !== null && schematicPortId !== void 0
-    ).map(asSchematicPortId)
+    ).map(asSchematicPortId).map(resolveRoutedSchematicPortId)
   );
   const solverManagedNetLabelSchematicPortIds = new Set(
     netLabelsInScope.filter(
       (netLabel) => netLabel._parsedProps.inline || netLabel._parsedProps.schX === void 0 && netLabel._parsedProps.schY === void 0
     ).flatMap((netLabel) => netLabel._getConnectedPorts()).map((port) => port.schematic_port_id).filter(
       (schematicPortId) => schematicPortId !== null && schematicPortId !== void 0
-    ).map(asSchematicPortId)
+    ).map(asSchematicPortId).map(resolveRoutedSchematicPortId)
   );
   const schematicPortIdsWithInlineNetLabels = new Set(
     netLabelsInScope.filter((netLabel) => netLabel._parsedProps.inline).flatMap((netLabel) => netLabel._getConnectedPorts()).map((port) => port.schematic_port_id).filter(
       (schematicPortId) => schematicPortId !== null && schematicPortId !== void 0
-    ).map(asSchematicPortId)
+    ).map(asSchematicPortId).map(resolveRoutedSchematicPortId)
   );
   const allowedSubcircuitIds = /* @__PURE__ */ new Set();
   if (group.subcircuit_id) allowedSubcircuitIds.add(group.subcircuit_id);
@@ -49431,10 +49437,14 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     )
   );
   for (const st of tracesInScope) {
-    const connected = (st.connected_source_port_ids ?? []).map(
-      (sourcePortId) => sourcePortIdToSchPortId.get(asSourcePortId(sourcePortId))
-    ).filter(
-      (schematicPortId) => Boolean(schematicPortId) && schematicPortIdsInScope.has(schematicPortId)
+    const connected = Array.from(
+      new Set(
+        (st.connected_source_port_ids ?? []).map(
+          (sourcePortId) => sourcePortIdToSchPortId.get(asSourcePortId(sourcePortId))
+        ).filter(
+          (schematicPortId) => Boolean(schematicPortId) && schematicPortIdsInScope.has(schematicPortId)
+        ).map(resolveRoutedSchematicPortId)
+      )
     );
     const sourcePortIdForSingleConnectedEndpoint = connected.length === 1 ? schPortIdToSourcePortId.get(connected[0]) : void 0;
     const otherSourcePortId = sourcePortIdForSingleConnectedEndpoint ? st.connected_source_port_ids.map(asSourcePortId).find(
@@ -49599,24 +49609,15 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     if (!connKeyToSchematicPortIds.has(connKey)) {
       connKeyToSchematicPortIds.set(connKey, []);
     }
-    connKeyToSchematicPortIds.get(connKey).push(schId);
+    const routedSchematicPortId = resolveRoutedSchematicPortId(schId);
+    const netSchematicPortIds = connKeyToSchematicPortIds.get(connKey);
+    if (!netSchematicPortIds.includes(routedSchematicPortId)) {
+      netSchematicPortIds.push(routedSchematicPortId);
+    }
   }
   for (const [connKey, schematicPortIds] of connKeyToSchematicPortIds) {
     const sourceNet = connKeyToSourceNet.get(connKey);
     if (sourceNet && schematicPortIds.length >= 1) {
-      const seenRoutedSchematicPortIds = /* @__PURE__ */ new Set();
-      const uniqueSchematicPortIds = schematicPortIds.filter(
-        (schematicPortId) => {
-          const componentPort = componentPortBySchematicPortId.get(schematicPortId);
-          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 userNetId = String(
         sourceNet.name || sourceNet.source_net_id || connKey
       );
@@ -49632,7 +49633,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       }
       netConnections.push({
         netId: userNetId,
-        schematicPortIds: uniqueSchematicPortIds,
+        schematicPortIds,
         isGround: sourceNet.is_ground,
         netLabelWidth,
         netLabelHeight,
@@ -49713,6 +49714,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   );
   return {
     inputProblem,
+    routedSchematicPortIdBySchematicPortId,
     connKeyToSourceNet,
     userNetIdToConnKey,
     crossScopeSourceTraceIdBySchematicPortIdAndNetId,
@@ -49727,7 +49729,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithAssignedNetLabels.ts
-var getSchematicPortIdsWithAssignedNetLabels = (netLabels) => {
+var getSchematicPortIdsWithAssignedNetLabels = (netLabels, routedSchematicPortIdBySchematicPortId) => {
   const schematicPortIdsWithNetLabels = /* @__PURE__ */ new Set();
   for (const netLabel of netLabels) {
     const { inline, schX, schY } = netLabel._parsedProps;
@@ -49737,7 +49739,9 @@ var getSchematicPortIdsWithAssignedNetLabels = (netLabels) => {
     for (const port of netLabelPorts) {
       if (!port.schematic_port_id) continue;
       schematicPortIdsWithNetLabels.add(
-        asSchematicPortId(port.schematic_port_id)
+        routedSchematicPortIdBySchematicPortId.get(
+          asSchematicPortId(port.schematic_port_id)
+        ) ?? asSchematicPortId(port.schematic_port_id)
       );
     }
   }
@@ -49983,6 +49987,7 @@ var renderSchematicTracesForSheet = ({
 }) => {
   const {
     inputProblem,
+    routedSchematicPortIdBySchematicPortId,
     connKeyToSourceNet,
     schematicPortIdsInScope,
     schematicPortIdsWithExternallyRoutedRepresentations,
@@ -49998,7 +50003,10 @@ var renderSchematicTracesForSheet = ({
     netLabels
   });
   if (inputProblem.chips.length === 0) return;
-  const schematicPortIdsWithPreExistingNetLabels = getSchematicPortIdsWithAssignedNetLabels(netLabelsInScope);
+  const schematicPortIdsWithPreExistingNetLabels = getSchematicPortIdsWithAssignedNetLabels(
+    netLabelsInScope,
+    routedSchematicPortIdBySchematicPortId
+  );
   const hasRouteableSchematicConnections = inputProblem.directConnections.length > 0 || inputProblem.netConnections.length > 0;
   if (!hasRouteableSchematicConnections) {
     insertNetLabelsForPortsMissingTrace({
@@ -50040,6 +50048,7 @@ var renderSchematicTracesForSheet = ({
   });
   applyNetLabelPlacements({
     group,
+    routedSchematicPortIdBySchematicPortId,
     solver,
     connKeyToSourceNet,
     userNetIdToConnKey,
@@ -50057,6 +50066,15 @@ var renderSchematicTracesForSheet = ({
     sourceTraceIdByPinPairKey,
     crossScopeSourceTraceIdBySchematicPortIdAndNetId
   });
+  const { db } = group.root;
+  for (const [
+    schematicPortId,
+    routedSchematicPortId
+  ] of routedSchematicPortIdBySchematicPortId) {
+    if (db.schematic_port.get(routedSchematicPortId)?.is_connected) {
+      db.schematic_port.update(schematicPortId, { is_connected: true });
+    }
+  }
   insertNetLabelsForPortsMissingTrace({
     group,
     schematicPortIdsInScope,
@@ -51437,7 +51455,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1870",
+  version: "0.0.1872",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -51492,7 +51510,7 @@ var package_default = {
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.646",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.188",
+    "@tscircuit/schematic-trace-solver": "^0.0.189",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@tscircuit/via-stitch-solver": "github:tscircuit/via-stitch-solver#75653b6440e75584b052f03595afd34283ae7558",
@@ -54967,32 +54985,14 @@ var PushButton = class extends NormalComponent3 {
     const symPort1 = symbol.ports.find((p) => p.labels.includes("1"));
     const symPort2 = symbol.ports.find((p) => p.labels.includes("2"));
     const ports = this.selectAll("port");
-    const pin1Port = ports.find((p) => p.props.pinNumber === 1);
-    const pin2Port = ports.find((p) => p.props.pinNumber === 2);
-    const pin3Port = ports.find((p) => p.props.pinNumber === 3);
-    const pin4Port = ports.find((p) => p.props.pinNumber === 4);
-    const { internallyConnectedPins } = this._parsedProps;
+    const pin1Port = ports.find((port) => port.props.pinNumber === 1);
     pin1Port.schematicSymbolPortDef = symPort1;
-    if (!internallyConnectedPins || internallyConnectedPins.length === 0) {
-      pin2Port.schematicSymbolPortDef = symPort2;
-    }
-    for (const [pn, port] of [
-      [2, pin2Port],
-      [3, pin3Port],
-      [4, pin4Port]
-    ]) {
-      const internallyConnectedRow = internallyConnectedPins?.find(
-        ([pin1, pin2]) => pin1 === `pin${pn}` || pin2 === `pin${pn}`
-      );
-      if (!internallyConnectedRow) {
-        port.schematicSymbolPortDef = symPort2;
-        break;
-      }
-      const internallyConnectedTo = internallyConnectedRow?.[0] === `pin${pn}` ? internallyConnectedRow[1] : internallyConnectedRow?.[0];
-      if (internallyConnectedTo === "pin1") {
-        continue;
-      }
-      port.schematicSymbolPortDef = symPort2;
+    const firstTerminalPorts = new Set(
+      pin1Port._getPortsInternallyConnectedToThisPort()
+    );
+    const secondTerminalPort = ports.filter((port) => port !== pin1Port && !firstTerminalPorts.has(port)).sort((a, b) => (a.props.pinNumber ?? 0) - (b.props.pinNumber ?? 0))[0];
+    if (secondTerminalPort) {
+      secondTerminalPort.schematicSymbolPortDef = symPort2;
     }
   }
   doInitialSourceRender() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1871",
+  "version": "0.0.1873",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -56,7 +56,7 @@
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.646",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "^0.0.188",
+    "@tscircuit/schematic-trace-solver": "^0.0.189",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@tscircuit/via-stitch-solver": "github:tscircuit/via-stitch-solver#75653b6440e75584b052f03595afd34283ae7558",