@tscircuit/circuit-json-util 0.0.53 → 0.0.55

package/dist/index.js

@@ -3,8 +3,7 @@ import * as Soup from "circuit-json";
 
 // lib/subtree.ts
 function connect(map, a, b) {
-  if (!a || !b)
-    return;
+  if (!a || !b) return;
   let setA = map.get(a);
   if (!setA) {
     setA = /* @__PURE__ */ new Set();
@@ -19,8 +18,7 @@ function connect(map, a, b) {
   setB.add(a);
 }
 function buildSubtree(soup, opts) {
-  if (!opts.subcircuit_id && !opts.source_group_id)
-    return [...soup];
+  if (!opts.subcircuit_id && !opts.source_group_id) return [...soup];
   const idMap = /* @__PURE__ */ new Map();
   for (const elm of soup) {
     const idVal = elm[`${elm.type}_id`];
@@ -32,6 +30,7 @@ function buildSubtree(soup, opts) {
   for (const elm of soup) {
     const entries = Object.entries(elm);
     for (const [key, val] of entries) {
+      if (key === "parent_source_group_id") continue;
       if (key.endsWith("_id") && typeof val === "string") {
         const other = idMap.get(val);
         connect(adj, elm, other);
@@ -58,8 +57,7 @@ function buildSubtree(soup, opts) {
   while (queue.length > 0) {
     const elm = queue.shift();
     const neighbors = adj.get(elm);
-    if (!neighbors)
-      continue;
+    if (!neighbors) continue;
     for (const n of neighbors) {
       if (!included.has(n)) {
         included.add(n);
@@ -83,8 +81,7 @@ var cju = (circuitJsonInput, options = {}) => {
     for (const elm of circuitJson) {
       const type = elm.type;
       const idVal = elm[`${type}_id`];
-      if (!idVal)
-        continue;
+      if (!idVal) continue;
       const idNum = Number.parseInt(idVal.split("_").pop());
       if (!Number.isNaN(idNum)) {
         internalStore.counts[type] = Math.max(
@@ -128,8 +125,7 @@ var cju = (circuitJsonInput, options = {}) => {
             const joiner = circuitJson.find(
               (e) => e.type === join_type && e[join_key] === using[join_key]
             );
-            if (!joiner)
-              return null;
+            if (!joiner) return null;
             return circuitJson.find(
               (e) => e.type === component_type && e[`${component_type}_id`] === joiner[`${component_type}_id`]
             );
@@ -167,8 +163,7 @@ var cju = (circuitJsonInput, options = {}) => {
             const elm = circuitJson.find(
               (e) => e[`${component_type}_id`] === id
             );
-            if (!elm)
-              return;
+            if (!elm) return;
             circuitJson.splice(circuitJson.indexOf(elm), 1);
             internalStore.editCount++;
           },
@@ -176,8 +171,7 @@ var cju = (circuitJsonInput, options = {}) => {
             const elm = circuitJson.find(
               (e) => e.type === component_type && e[`${component_type}_id`] === id
             );
-            if (!elm)
-              return null;
+            if (!elm) return null;
             Object.assign(elm, newProps);
             internalStore.editCount++;
             return elm;
@@ -192,15 +186,12 @@ var cju = (circuitJsonInput, options = {}) => {
               const source_component = circuitJson.find(
                 (e) => e.type === "source_component" && e.name === component_name
               );
-              if (!source_component)
-                return null;
+              if (!source_component) return null;
               const source_port = circuitJson.find(
                 (e) => e.type === "source_port" && e.source_component_id === source_component.source_component_id && (e.name === port_selector || (e.port_hints ?? []).includes(port_selector))
               );
-              if (!source_port)
-                return null;
-              if (component_type === "source_port")
-                return source_port;
+              if (!source_port) return null;
+              if (component_type === "source_port") return source_port;
               if (component_type === "pcb_port") {
                 return circuitJson.find(
                   (e) => e.type === "pcb_port" && e.source_port_id === source_port.source_port_id
@@ -239,8 +230,7 @@ var cjuIndexed = (soup, options = {}) => {
     for (const elm of soup) {
       const type = elm.type;
       const idVal = elm[`${type}_id`];
-      if (!idVal)
-        continue;
+      if (!idVal) continue;
       const idNum = Number.parseInt(idVal.split("_").pop() || "");
       if (!Number.isNaN(idNum)) {
         internalStore.counts[type] = Math.max(
@@ -365,8 +355,7 @@ var cjuIndexed = (soup, options = {}) => {
               if (relationMap) {
                 const relatedElements = relationMap.get(using[join_key]) || [];
                 const joiner2 = relatedElements.find((e) => e.type === join_type);
-                if (!joiner2)
-                  return null;
+                if (!joiner2) return null;
                 const joinerId = joiner2[`${component_type}_id`];
                 if (indexConfig.byId && internalStore.indexes.byId) {
                   return internalStore.indexes.byId.get(
@@ -387,8 +376,7 @@ var cjuIndexed = (soup, options = {}) => {
             const joiner = soup.find(
               (e) => e.type === join_type && e[join_key] === using[join_key]
             );
-            if (!joiner)
-              return null;
+            if (!joiner) return null;
             return soup.find(
               (e) => e.type === component_type && e[`${component_type}_id`] === joiner[`${component_type}_id`]
             ) || null;
@@ -527,8 +515,7 @@ var cjuIndexed = (soup, options = {}) => {
             } else {
               elm = soup.find((e) => e[`${component_type}_id`] === id);
             }
-            if (!elm)
-              return;
+            if (!elm) return;
             const elmIndex = soup.indexOf(elm);
             if (elmIndex >= 0) {
               soup.splice(elmIndex, 1);
@@ -605,8 +592,7 @@ var cjuIndexed = (soup, options = {}) => {
                 (e) => e.type === component_type && e[`${component_type}_id`] === id
               );
             }
-            if (!elm)
-              return null;
+            if (!elm) return null;
             if (indexConfig.byRelation && internalStore.indexes.byRelation) {
               const elementEntries = Object.entries(elm);
               for (const [key, value] of elementEntries) {
@@ -722,13 +708,11 @@ var cjuIndexed = (soup, options = {}) => {
               const source_component = soup.find(
                 (e) => e.type === "source_component" && e.name === component_name
               );
-              if (!source_component)
-                return null;
+              if (!source_component) return null;
               const source_port = soup.find(
                 (e) => e.type === "source_port" && e.source_component_id === source_component.source_component_id && (e.name === port_selector || (e.port_hints ?? []).includes(port_selector))
               );
-              if (!source_port)
-                return null;
+              if (!source_port) return null;
               if (component_type === "source_port")
                 return source_port;
               if (component_type === "pcb_port") {
@@ -757,53 +741,33 @@ import { applyToPoint, decomposeTSR } from "transformation-matrix";
 
 // lib/direction-to-vec.ts
 var directionToVec = (direction) => {
-  if (direction === "up")
-    return { x: 0, y: 1 };
-  else if (direction === "down")
-    return { x: 0, y: -1 };
-  else if (direction === "left")
-    return { x: -1, y: 0 };
-  else if (direction === "right")
-    return { x: 1, y: 0 };
-  else
-    throw new Error("Invalid direction");
+  if (direction === "up") return { x: 0, y: 1 };
+  else if (direction === "down") return { x: 0, y: -1 };
+  else if (direction === "left") return { x: -1, y: 0 };
+  else if (direction === "right") return { x: 1, y: 0 };
+  else throw new Error("Invalid direction");
 };
 var vecToDirection = ({ x, y }) => {
-  if (x > y)
-    y = 0;
-  if (y > x)
-    x = 0;
-  if (x > 0 && y === 0)
-    return "right";
-  else if (x < 0 && y === 0)
-    return "left";
-  else if (x === 0 && y > 0)
-    return "up";
-  else if (x === 0 && y < 0)
-    return "down";
-  else
-    throw new Error(`Invalid vector for direction conversion (${x}, ${y})`);
+  if (x > y) y = 0;
+  if (y > x) x = 0;
+  if (x > 0 && y === 0) return "right";
+  else if (x < 0 && y === 0) return "left";
+  else if (x === 0 && y > 0) return "up";
+  else if (x === 0 && y < 0) return "down";
+  else throw new Error(`Invalid vector for direction conversion (${x}, ${y})`);
 };
 var rotateClockwise = (direction) => {
-  if (direction === "up")
-    return "right";
-  else if (direction === "right")
-    return "down";
-  else if (direction === "down")
-    return "left";
-  else if (direction === "left")
-    return "up";
+  if (direction === "up") return "right";
+  else if (direction === "right") return "down";
+  else if (direction === "down") return "left";
+  else if (direction === "left") return "up";
   throw new Error(`Invalid direction: ${direction}`);
 };
 var rotateCounterClockwise = (direction) => {
-  if (direction === "up")
-    return "left";
-  else if (direction === "left")
-    return "down";
-  else if (direction === "down")
-    return "right";
-  else if (direction === "right")
-    return "up";
+  if (direction === "up") return "left";
+  else if (direction === "left") return "down";
+  else if (direction === "down") return "right";
+  else if (direction === "right") return "up";
   throw new Error(`Invalid direction: ${direction}`);
 };
 var rotateDirection = (direction, num90DegreeClockwiseTurns) => {
@@ -818,25 +782,17 @@ var rotateDirection = (direction, num90DegreeClockwiseTurns) => {
   return direction;
 };
 var oppositeDirection = (direction) => {
-  if (direction === "up")
-    return "down";
-  else if (direction === "down")
-    return "up";
-  else if (direction === "left")
-    return "right";
-  else if (direction === "right")
-    return "left";
+  if (direction === "up") return "down";
+  else if (direction === "down") return "up";
+  else if (direction === "left") return "right";
+  else if (direction === "right") return "left";
   throw new Error(`Invalid direction: ${direction}`);
 };
 var oppositeSide = (sideOrDir) => {
-  if (sideOrDir === "top" || sideOrDir === "up")
-    return "bottom";
-  else if (sideOrDir === "bottom" || sideOrDir === "down")
-    return "top";
-  else if (sideOrDir === "left")
-    return "right";
-  else if (sideOrDir === "right")
-    return "left";
+  if (sideOrDir === "top" || sideOrDir === "up") return "bottom";
+  else if (sideOrDir === "bottom" || sideOrDir === "down") return "top";
+  else if (sideOrDir === "left") return "right";
+  else if (sideOrDir === "right") return "left";
   throw new Error(`Invalid sideOrDir: ${sideOrDir}`);
 };
 
@@ -961,6 +917,7 @@ var applySelectorAST = (elements, selectorAST) => {
     case "complex": {
       switch (selectorAST.combinator) {
         case " ":
+        // TODO technically should do a deep search
         case ">": {
           const { left, right } = selectorAST;
           if (left.type === "class" || left.type === "type") {
@@ -1048,16 +1005,13 @@ function getReadableNameForPcbTrace(soup, pcb_trace_id) {
   }
   function getComponentAndPortInfo(pcb_port_id) {
     const pcbPort = cju(soup).pcb_port.get(pcb_port_id);
-    if (!pcbPort)
-      return null;
+    if (!pcbPort) return null;
     const pcbComponent = cju(soup).pcb_component.get(pcbPort.pcb_component_id);
-    if (!pcbComponent)
-      return null;
+    if (!pcbComponent) return null;
     const sourceComponent = cju(soup).source_component.get(
       pcbComponent.source_component_id
     );
-    if (!sourceComponent)
-      return null;
+    if (!sourceComponent) return null;
     const sourcePort = cju(soup).source_port.get(pcbPort.source_port_id);
     const portHint = sourcePort?.port_hints ? sourcePort.port_hints[1] : "";
     return {
@@ -1119,8 +1073,7 @@ function getReadableNameForPcbSmtpad(soup, pcb_smtpad_id) {
 var getReadableNameForElement = (soup, elm) => {
   if (typeof elm === "string") {
     const elmObj = getElementById(soup, elm);
-    if (!elmObj)
-      `unknown (could not find element with id ${elm})`;
+    if (!elmObj) `unknown (could not find element with id ${elm})`;
     return getReadableNameForElement(soup, elmObj);
   }
   switch (elm.type) {
@@ -1144,8 +1097,7 @@ var getBoundsOfPcbElements = (elements) => {
   let maxX = Number.NEGATIVE_INFINITY;
   let maxY = Number.NEGATIVE_INFINITY;
   for (const elm of elements) {
-    if (!elm.type.startsWith("pcb_"))
-      continue;
+    if (!elm.type.startsWith("pcb_")) continue;
     let centerX;
     let centerY;
     let width;
@@ -1200,8 +1152,7 @@ var getBoundsOfPcbElements = (elements) => {
 // lib/utils/string-hash.ts
 function stringHash(str) {
   let hash = 0;
-  if (str.length == 0)
-    return hash;
+  if (str.length == 0) return hash;
   for (var i = 0; i < str.length; i++) {
     var char = str.charCodeAt(i);
     hash = (hash << 5) - hash + char;
@@ -1345,8 +1296,7 @@ var getDebugLayoutObject = (lo) => {
   }
   const title = lo.text || lo.name || lo.source?.text || lo.source?.name || "?";
   const content = lo;
-  if (x === void 0 || y === void 0)
-    return null;
+  if (x === void 0 || y === void 0) return null;
   if (width === void 0) {
     if ("outer_diameter" in lo) {
       width = lo.outer_diameter;
@@ -1405,8 +1355,7 @@ var repositionPcbComponentTo = (circuitJson, pcb_component_id, newCenter) => {
   const pcbComponent = circuitJson.find(
     (e) => e.type === "pcb_component" && e.pcb_component_id === pcb_component_id
   );
-  if (!pcbComponent)
-    return;
+  if (!pcbComponent) return;
   const currentCenter = "center" in pcbComponent ? pcbComponent.center : { x: pcbComponent.x, y: pcbComponent.y };
   const dx = newCenter.x - currentCenter.x;
   const dy = newCenter.y - currentCenter.y;
@@ -1414,15 +1363,12 @@ var repositionPcbComponentTo = (circuitJson, pcb_component_id, newCenter) => {
     (e) => e.type === "pcb_port" && e.pcb_component_id === pcb_component_id
   ).map((e) => e.pcb_port_id);
   const elementsToMove = circuitJson.filter((elm) => {
-    if (elm === pcbComponent)
-      return true;
+    if (elm === pcbComponent) return true;
     const anyElm = elm;
-    if (anyElm.pcb_component_id === pcb_component_id)
-      return true;
+    if (anyElm.pcb_component_id === pcb_component_id) return true;
     if (Array.isArray(anyElm.pcb_component_ids) && anyElm.pcb_component_ids.includes(pcb_component_id))
       return true;
-    if (anyElm.pcb_port_id && portIds.includes(anyElm.pcb_port_id))
-      return true;
+    if (anyElm.pcb_port_id && portIds.includes(anyElm.pcb_port_id)) return true;
     if (Array.isArray(anyElm.pcb_port_ids) && anyElm.pcb_port_ids.some((id) => portIds.includes(id)))
       return true;
     if (anyElm.start_pcb_port_id && portIds.includes(anyElm.start_pcb_port_id))
@@ -1438,6 +1384,83 @@ var repositionPcbComponentTo = (circuitJson, pcb_component_id, newCenter) => {
   const matrix = translate(dx, dy);
   transformPCBElements(elementsToMove, matrix);
 };
+
+// lib/getCircuitJsonTree.ts
+var getCircuitJsonTree = (circuitJson, opts) => {
+  const groupChildMap = /* @__PURE__ */ new Map();
+  for (const elm of circuitJson) {
+    if (elm.type === "source_group" && elm.parent_source_group_id) {
+      const parentId = elm.parent_source_group_id;
+      const childId = elm.source_group_id;
+      const children = groupChildMap.get(parentId) ?? [];
+      children.push(childId);
+      groupChildMap.set(parentId, children);
+      if (!groupChildMap.has(childId)) {
+        groupChildMap.set(childId, []);
+      }
+    }
+  }
+  const groupNodes = /* @__PURE__ */ new Map();
+  const getNextGroupId = () => {
+    for (const [parentId, children] of groupChildMap) {
+      if (groupNodes.has(parentId)) continue;
+      if (children.every((childId) => groupNodes.has(childId))) {
+        return parentId;
+      }
+    }
+    return null;
+  };
+  let lastGroupId = null;
+  while (true) {
+    const nextGroupId = getNextGroupId();
+    if (!nextGroupId) break;
+    const sourceGroup = circuitJson.find(
+      (elm) => elm.type === "source_group" && elm.source_group_id === nextGroupId
+    );
+    const node = {
+      nodeType: "group",
+      sourceGroup,
+      otherChildElements: [],
+      childNodes: [
+        ...groupChildMap.get(nextGroupId)?.map((childId) => groupNodes.get(childId)) ?? [],
+        ...circuitJson.filter(
+          (elm) => elm.type === "source_component" && elm.source_group_id === nextGroupId
+        ).map((elm) => {
+          return {
+            nodeType: "component",
+            sourceComponent: elm,
+            childNodes: [],
+            otherChildElements: []
+            // TODO
+          };
+        })
+      ]
+    };
+    groupNodes.set(nextGroupId, node);
+    lastGroupId = nextGroupId;
+  }
+  if (!lastGroupId) {
+    throw new Error(
+      "Could not compute circuit tree because no groups were processed"
+    );
+  }
+  return groupNodes.get(opts?.source_group_id ?? lastGroupId);
+};
+
+// lib/getStringFromCircuitJsonTree.ts
+var getStringFromCircuitJsonTree = (circuitJsonTree, indent = 0) => {
+  if (circuitJsonTree.nodeType === "component") {
+    return `${" ".repeat(indent)}${circuitJsonTree.sourceComponent?.name ?? circuitJsonTree.sourceComponent?.source_component_id}`;
+  }
+  const lines = [];
+  lines.push(
+    `${" ".repeat(indent)}${circuitJsonTree.sourceGroup?.name ?? circuitJsonTree.sourceGroup?.source_group_id}`
+  );
+  for (const child of circuitJsonTree.childNodes) {
+    lines.push(getStringFromCircuitJsonTree(child, indent + 2));
+  }
+  return lines.join("\n");
+};
 export {
   applySelector,
   applySelectorAST,
@@ -1447,6 +1470,7 @@ export {
   directionToVec,
   findBoundsAndCenter,
   getBoundsOfPcbElements,
+  getCircuitJsonTree,
   getElementById,
   getElementId,
   getPrimaryId,
@@ -1454,6 +1478,7 @@ export {
   getReadableNameForPcbPort,
   getReadableNameForPcbSmtpad,
   getReadableNameForPcbTrace,
+  getStringFromCircuitJsonTree,
   oppositeDirection,
   oppositeSide,
   repositionPcbComponentTo,