@tscircuit/circuit-json-util 0.0.76 → 0.0.78

package/dist/index.js

@@ -19,9 +19,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);
     }
@@ -47,9 +91,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);
     }
@@ -1757,6 +1809,10 @@ function getElementRenderLayers(element) {
     const layer = element.layer;
     return [`${layer}_fabrication_note`];
   }
+  if (element.type === "pcb_courtyard_circle" || element.type === "pcb_courtyard_polygon" || element.type === "pcb_courtyard_rect" || element.type === "pcb_courtyard_outline") {
+    const layer = element.layer;
+    return [`${layer}_courtyard`];
+  }
   return [];
 }
 export {