@tscircuit/pcb-viewer 1.11.342 → 1.11.344

package/dist/index.js

@@ -5433,9 +5433,53 @@ function connect(map, a, b) {
 }
 function buildSubtree(soup, opts) {
   if (!opts.subcircuit_id && !opts.source_group_id) return [...soup];
+  let effectiveOpts = opts;
+  if (opts.subcircuit_id) {
+    const subcircuitIds = /* @__PURE__ */ new Set([opts.subcircuit_id]);
+    const groupChildren = /* @__PURE__ */ new Map();
+    const groupSubcircuit = /* @__PURE__ */ new Map();
+    for (const elm of soup) {
+      if (elm.type === "source_group") {
+        const groupId = elm.source_group_id;
+        const subcircuitId = elm.subcircuit_id;
+        if (subcircuitId) {
+          groupSubcircuit.set(groupId, subcircuitId);
+        }
+        const parentId = elm.parent_source_group_id;
+        if (parentId) {
+          if (!groupChildren.has(parentId)) {
+            groupChildren.set(parentId, []);
+          }
+          groupChildren.get(parentId).push(groupId);
+        }
+      }
+    }
+    let rootGroupId;
+    for (const [groupId, subcircuitId] of groupSubcircuit) {
+      if (subcircuitId === opts.subcircuit_id) {
+        rootGroupId = groupId;
+        break;
+      }
+    }
+    if (rootGroupId) {
+      const collectChildSubcircuits = (groupId) => {
+        const children = groupChildren.get(groupId) || [];
+        for (const childId of children) {
+          const childSubcircuit = groupSubcircuit.get(childId);
+          if (childSubcircuit) {
+            subcircuitIds.add(childSubcircuit);
+          }
+          collectChildSubcircuits(childId);
+        }
+      };
+      collectChildSubcircuits(rootGroupId);
+      effectiveOpts = { ...opts, subcircuit_ids: Array.from(subcircuitIds) };
+    }
+  }
   const idMap = /* @__PURE__ */ new Map();
   for (const elm of soup) {
-    const idVal = elm[`${elm.type}_id`];
+    const idKey = `${elm.type}_id`;
+    const idVal = elm[idKey];
     if (typeof idVal === "string") {
       idMap.set(idVal, elm);
     }
@@ -5461,9 +5505,17 @@ function buildSubtree(soup, opts) {
   const queue = [];
   const included = /* @__PURE__ */ new Set();
   for (const elm of soup) {
-    if (opts.subcircuit_id && elm.subcircuit_id === opts.subcircuit_id || opts.source_group_id && (elm.source_group_id === opts.source_group_id || Array.isArray(elm.member_source_group_ids) && elm.member_source_group_ids.includes(
-      opts.source_group_id
-    ))) {
+    let shouldInclude = false;
+    if (effectiveOpts.subcircuit_id && "subcircuit_id" in elm && elm.subcircuit_id === effectiveOpts.subcircuit_id) {
+      shouldInclude = true;
+    } else if (effectiveOpts.subcircuit_ids && "subcircuit_id" in elm && elm.subcircuit_id && effectiveOpts.subcircuit_ids.includes(elm.subcircuit_id)) {
+      shouldInclude = true;
+    } else if (effectiveOpts.source_group_id && "source_group_id" in elm && elm.source_group_id === effectiveOpts.source_group_id) {
+      shouldInclude = true;
+    } else if (effectiveOpts.source_group_id && "member_source_group_ids" in elm && Array.isArray(elm.member_source_group_ids) && elm.member_source_group_ids.includes(effectiveOpts.source_group_id)) {
+      shouldInclude = true;
+    }
+    if (shouldInclude) {
       queue.push(elm);
       included.add(elm);
     }
@@ -14139,7 +14191,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.341",
+  version: "1.11.343",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -14163,7 +14215,7 @@ var package_default = {
     "@semantic-release/npm": "^9.0.1",
     "@semantic-release/release-notes-generator": "^10.0.3",
     "@swc/core": "^1.4.12",
-    "@tscircuit/circuit-json-util": "^0.0.75",
+    "@tscircuit/circuit-json-util": "^0.0.78",
     "@tscircuit/eagle-xml-converter": "^1.0.0",
     "@types/bun": "latest",
     "@types/color": "^3.0.6",
@@ -14189,11 +14241,11 @@ var package_default = {
   },
   dependencies: {
     "@emotion/css": "^11.11.2",
-    "@tscircuit/alphabet": "^0.0.20",
+    "@tscircuit/alphabet": "^0.0.22",
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
-    "circuit-json": "^0.0.374",
-    "circuit-to-canvas": "^0.0.79",
+    "circuit-json": "^0.0.387",
+    "circuit-to-canvas": "^0.0.81",
     "circuit-to-svg": "^0.0.323",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",