@tscircuit/core 0.0.540 → 0.0.542

package/dist/index.js

@@ -7272,12 +7272,10 @@ import {
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
 import "@tscircuit/circuit-json-util";
 import "circuit-json-to-connectivity-map";
-import corpus from "@tscircuit/schematic-corpus/dist/bundled-bpc-graphs.json" with { type: "json" };
+import corpus from "@tscircuit/schematic-corpus";
 import { convertCircuitJsonToBpc } from "circuit-json-to-bpc";
 import {
-  assignFloatingBoxPositions,
-  netAdaptBpcGraph,
-  getBpcGraphWlDistance
+  layoutSchematicGraph
 } from "bpc-graph";
 function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const { db } = group.root;
@@ -7327,42 +7325,20 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
     subtreeCircuitJson.push(schematic_net_label);
   }
   const targetBpcGraph = convertCircuitJsonToBpc(subtreeCircuitJson);
-  for (const box of targetBpcGraph.boxes) {
-    if (box.kind === "fixed" || box.center) {
-      box.kind = "floating";
-      box.center = void 0;
-    }
-  }
-  let bestMatch = {
-    boxes: [],
-    pins: []
-  };
-  let bestWlDistance = Infinity;
-  let winningBpcGraphName = "empty";
-  for (const [candidateBpcGraphName, candidateBpcGraph] of Object.entries(
+  const laidOutBpcGraph = layoutSchematicGraph(targetBpcGraph, {
+    singletonKeys: ["vcc/2", "gnd/2"],
+    centerPinColors: ["netlabel_center", "component_center"],
     corpus
-  ).sort((a, b) => a[0].localeCompare(b[0]))) {
-    const wlDistance = getBpcGraphWlDistance(
-      candidateBpcGraph,
-      targetBpcGraph
-    );
-    console.log(candidateBpcGraphName, wlDistance);
-    if (wlDistance < bestWlDistance) {
-      bestMatch = candidateBpcGraph;
-      winningBpcGraphName = candidateBpcGraphName;
-      bestWlDistance = wlDistance;
-      if (wlDistance === 0) break;
-    }
-  }
-  console.log(`Winning BPC graph: ${winningBpcGraphName}`);
-  const { adaptedBpcGraph } = netAdaptBpcGraph(
-    bestMatch,
-    targetBpcGraph
-  );
-  const adaptedBpcGraphWithPositions = assignFloatingBoxPositions(adaptedBpcGraph);
-  for (const box of adaptedBpcGraphWithPositions.boxes) {
+  });
+  const groupOffset = group._getGlobalSchematicPositionBeforeLayout();
+  for (const box of laidOutBpcGraph.boxes) {
+    if (!box.center) continue;
     const schematic_component2 = db.schematic_component.get(box.boxId);
     if (schematic_component2) {
+      const newCenter = {
+        x: box.center.x + groupOffset.x,
+        y: box.center.y + groupOffset.y
+      };
       const ports = db.schematic_port.list({
         schematic_component_id: schematic_component2.schematic_component_id
       });
@@ -7370,8 +7346,8 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
         schematic_component_id: schematic_component2.schematic_component_id
       });
       const positionDelta = {
-        x: schematic_component2.center.x - box.center.x,
-        y: schematic_component2.center.y - box.center.y
+        x: newCenter.x - schematic_component2.center.x,
+        y: newCenter.y - schematic_component2.center.y
       };
       for (const port of ports) {
         port.center.x += positionDelta.x;
@@ -7381,30 +7357,31 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
         text.position.x += positionDelta.x;
         text.position.y += positionDelta.y;
       }
-      schematic_component2.center.x += positionDelta.x;
-      schematic_component2.center.y += positionDelta.y;
+      schematic_component2.center = newCenter;
       continue;
     }
     const schematic_net_label = db.schematic_net_label.get(box.boxId);
     if (schematic_net_label) {
-      const pin = adaptedBpcGraphWithPositions.pins.find(
+      const pin = laidOutBpcGraph.pins.find(
         (p) => p.boxId === box.boxId && p.color === "netlabel_center"
       );
       if (!pin) {
         throw new Error(`No pin found for net label: ${box.boxId}`);
       }
-      schematic_net_label.center = box.center;
+      const finalCenter = {
+        x: box.center.x + groupOffset.x,
+        y: box.center.y + groupOffset.y
+      };
+      schematic_net_label.center = finalCenter;
       schematic_net_label.anchor_position = {
-        x: box.center.x + pin.offset.x,
-        y: box.center.y + pin.offset.y
+        x: finalCenter.x + pin.offset.x,
+        y: finalCenter.y + pin.offset.y
       };
       continue;
     }
     if (generatedNetLabels.has(box.boxId)) {
       const { schematic_net_label: generatedNetLabel, schematic_port } = generatedNetLabels.get(box.boxId);
-      const pins = adaptedBpcGraphWithPositions.pins.filter(
-        (p) => p.boxId === box.boxId
-      );
+      const pins = laidOutBpcGraph.pins.filter((p) => p.boxId === box.boxId);
       const center = pins.find((p) => p.color === "netlabel_center");
       const anchor = pins.find((p) => p.color !== "netlabel_center");
       const color = anchor.color;
@@ -7417,12 +7394,12 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
         text: source_net.name,
         // no text; just a placeholder box for Match-Adapt
         anchor_position: {
-          x: box.center.x + center.offset.x,
-          y: box.center.y + center.offset.y
+          x: box.center.x + groupOffset.x + center.offset.x,
+          y: box.center.y + groupOffset.y + center.offset.y
         },
         center: {
-          x: box.center.x + center.offset.x,
-          y: box.center.y + center.offset.y
+          x: box.center.x + groupOffset.x + center.offset.x,
+          y: box.center.y + groupOffset.y + center.offset.y
         },
         anchor_side: anchorSide,
         symbol_name: symbolName,
@@ -10701,7 +10678,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.539",
+  version: "0.0.541",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10735,7 +10712,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.248",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "@tscircuit/schematic-corpus": "^0.0.29",
+    "@tscircuit/schematic-corpus": "^0.0.33",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -10743,7 +10720,7 @@ var package_default = {
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
-    "bpc-graph": "^0.0.16",
+    "bpc-graph": "^0.0.46",
     "bun-match-svg": "0.0.11",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.540",
+  "version": "0.0.542",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -35,7 +35,7 @@
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.248",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "@tscircuit/schematic-corpus": "^0.0.29",
+    "@tscircuit/schematic-corpus": "^0.0.33",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -43,7 +43,7 @@
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
-    "bpc-graph": "^0.0.16",
+    "bpc-graph": "^0.0.46",
     "bun-match-svg": "0.0.11",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",