@tscircuit/pcb-viewer 1.11.428 → 1.11.429

package/dist/index.js

@@ -10315,46 +10315,74 @@ var getPadComponent = (pad, elements) => {
 
 // node_modules/circuit-json-to-connectivity-map/dist/index.js
 import { doesLineIntersectLine } from "@tscircuit/math-utils";
+function findNetworkRoot(networkRoot) {
+  let canonicalRoot = networkRoot;
+  while (canonicalRoot.parent !== null) canonicalRoot = canonicalRoot.parent;
+  let currentRoot = networkRoot;
+  while (currentRoot.parent !== null && currentRoot.parent !== canonicalRoot) {
+    const parentRoot = currentRoot.parent;
+    currentRoot.parent = canonicalRoot;
+    currentRoot = parentRoot;
+  }
+  return canonicalRoot;
+}
+function createNetworkRoot(nodeId, ctx) {
+  const member = { nodeId, nextMember: null };
+  const networkRoot = {
+    parent: null,
+    networkId: `connectivity_net${ctx.nextNetworkNumber++}`,
+    firstMember: member,
+    lastMember: member
+  };
+  ctx.rootByNodeId.set(nodeId, networkRoot);
+  return networkRoot;
+}
+function getOrCreateNetworkRoot(nodeId, ctx) {
+  const networkRoot = ctx.rootByNodeId.get(nodeId);
+  return networkRoot === void 0 ? createNetworkRoot(nodeId, ctx) : findNetworkRoot(networkRoot);
+}
+function mergeNetworkRoots({
+  targetRoot,
+  sourceRoot
+}) {
+  targetRoot.lastMember.nextMember = sourceRoot.firstMember;
+  targetRoot.lastMember = sourceRoot.lastMember;
+  sourceRoot.parent = targetRoot;
+}
+function getNetworkNodeIds(networkRoot) {
+  const nodeIds = [];
+  let member = networkRoot.firstMember;
+  while (member !== null) {
+    nodeIds.push(member.nodeId);
+    member = member.nextMember;
+  }
+  return nodeIds;
+}
 function findConnectedNetworks(connections) {
-  const networks = /* @__PURE__ */ new Map();
-  let netCounter = 0;
-  function getOrCreateNetwork(nodeId) {
-    for (const [, network] of networks) {
-      if (network.has(nodeId)) {
-        return network;
-      }
-    }
-    const newNetwork = /* @__PURE__ */ new Set();
-    networks.set(`connectivity_net${netCounter++}`, newNetwork);
-    return newNetwork;
-  }
+  const ctx = {
+    rootByNodeId: /* @__PURE__ */ new Map(),
+    nextNetworkNumber: 0
+  };
   for (const connection of connections) {
-    let network = null;
+    let targetRoot = null;
     for (const nodeId of connection) {
-      if (!network) {
-        network = getOrCreateNetwork(nodeId);
-      } else if (!network.has(nodeId)) {
-        const existingNetwork = getOrCreateNetwork(nodeId);
-        if (existingNetwork !== network) {
-          for (const node of existingNetwork) {
-            network.add(node);
-          }
-          networks.delete(
-            Array.from(networks.entries()).find(
-              ([, net]) => net === existingNetwork
-            )[0]
-          );
-        }
+      const sourceRoot = getOrCreateNetworkRoot(nodeId, ctx);
+      if (targetRoot === null) {
+        targetRoot = sourceRoot;
+        continue;
+      }
+      targetRoot = findNetworkRoot(targetRoot);
+      if (sourceRoot !== targetRoot) {
+        mergeNetworkRoots({ targetRoot, sourceRoot });
       }
-      network.add(nodeId);
     }
   }
-  return Object.fromEntries(
-    Array.from(networks.entries()).map(([netId, connectedNodes]) => [
-      netId,
-      Array.from(connectedNodes)
-    ])
-  );
+  const networks = {};
+  for (const networkRoot of ctx.rootByNodeId.values()) {
+    if (networkRoot.parent !== null) continue;
+    networks[networkRoot.networkId] = getNetworkNodeIds(networkRoot);
+  }
+  return networks;
 }
 var ConnectivityMap = class {
   netMap;
@@ -10470,13 +10498,17 @@ var getFullConnectivityMapFromCircuitJson = (circuitJson) => {
           (rp) => rp?.start_pcb_port_id
         )?.start_pcb_port_id;
         const endId = route.find((rp) => rp?.end_pcb_port_id)?.end_pcb_port_id;
-        if (startId && pcb_trace_id && endId) {
-          connections.push([startId, pcb_trace_id, endId]);
+        if (startId && pcb_trace_id) {
+          connections.push([startId, pcb_trace_id]);
+        }
+        if (pcb_trace_id && endId) {
+          connections.push([pcb_trace_id, endId]);
         }
       }
     } else if (element.type === "pcb_via") {
       const { pcb_via_id, pcb_trace_id, source_trace_id, source_net_id } = element;
       const connectedIds = [
+        ...element.pcb_port_ids ?? [],
         pcb_trace_id,
         source_trace_id,
         source_net_id
@@ -18652,7 +18684,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.427",
+  version: "1.11.428",
   main: "dist/index.js",
   type: "module",
   repository: {
@@ -18695,6 +18727,7 @@ var package_default = {
     "@types/react": "19",
     "@types/react-dom": "~19.1.0",
     "@webgpu/types": "^0.1.72",
+    "circuit-json-to-connectivity-map": "^0.0.35",
     esbuild: "^0.25.2",
     "format-si-unit": "^0.0.12",
     next: "^14.1.4",