@tscircuit/core 0.0.533 → 0.0.534

package/dist/index.js

@@ -5384,7 +5384,6 @@ var Trace2 = class extends PrimitiveComponent2 {
   }
   doInitialSchematicTraceRender() {
     if (this.root?.schematicDisabled) return;
-    if (this.getGroup()?._getSchematicLayoutMode() === "match-adapt") return;
     const { db } = this.root;
     const { _parsedProps: props, parent } = this;
     if (!parent) throw new Error("Trace has no parent");
@@ -5414,7 +5413,7 @@ var Trace2 = class extends PrimitiveComponent2 {
     if (isPortAndNetConnection) {
       const net = netsWithSelectors[0].net;
       const { port, position: anchorPos } = portsWithPosition[0];
-      const connectedNetLabel = this.getSubcircuit().selectAll("netlabel").find((nl) => {
+      let connectedNetLabel = this.getSubcircuit().selectAll("netlabel").find((nl) => {
         const conn = nl._parsedProps.connection ?? nl._parsedProps.connectsTo;
         if (!conn) return false;
         if (Array.isArray(conn)) {
@@ -5430,8 +5429,16 @@ var Trace2 = class extends PrimitiveComponent2 {
         });
         return targetPort === port;
       });
+      if (!connectedNetLabel) {
+        const dbNetLabel = db.schematic_net_label.getWhere({
+          source_trace_id: this.source_trace_id
+        });
+        if (dbNetLabel) {
+          connectedNetLabel = dbNetLabel;
+        }
+      }
       if (connectedNetLabel) {
-        const labelPos = connectedNetLabel._getGlobalSchematicPositionBeforeLayout();
+        const labelPos = "_getGlobalSchematicPositionBeforeLayout" in connectedNetLabel ? connectedNetLabel._getGlobalSchematicPositionBeforeLayout() : connectedNetLabel.anchor_position;
         const edges2 = [];
         if (anchorPos.x === labelPos.x || anchorPos.y === labelPos.y) {
           edges2.push({ from: anchorPos, to: labelPos });
@@ -7221,227 +7228,182 @@ var normalizePinLabels = (inputPinLabels) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
-import {
-  SchematicLayoutPipelineSolver,
-  reorderChipPinsToCcw,
-  convertCircuitJsonToInputNetlist,
-  getRefKey as getRefKey2
-} from "@tscircuit/schematic-match-adapt";
-import { circuitBuilderFromLayoutJson } from "@tscircuit/schematic-match-adapt";
+import "@tscircuit/schematic-match-adapt";
+import "@tscircuit/schematic-match-adapt";
 
 // lib/utils/schematic/deriveSourceTraceIdFromMatchAdaptPath.ts
 import {
   getRefKey,
   parseRefKey
 } from "@tscircuit/schematic-match-adapt";
-function getConnectivityNetIdFromPortRef(pref, db) {
-  if ("boxId" in pref) {
-    const { boxId: sourceComponentName, pinNumber } = pref;
-    const sourceComp = db.source_component.getWhere({
-      name: sourceComponentName
-    });
-    if (!sourceComp) {
-      throw new Error(
-        `Source component "${sourceComponentName}" not found, but returned from match-adapt ${JSON.stringify(pref)}`
-      );
-    }
-    const sourcePort = db.source_port.getWhere({
-      source_component_id: sourceComp.source_component_id,
-      pin_number: pinNumber
-    });
-    return {
-      subcircuit_connectivity_map_key: sourcePort?.subcircuit_connectivity_map_key ?? null,
-      source_port_id: sourcePort.source_port_id
-    };
-  }
-  if ("netId" in pref) {
-    const { netId: sourceNetName } = pref;
-    const sourceNet = db.source_net.getWhere({ name: sourceNetName });
-    return null;
-  }
-  if ("junctionId" in pref) {
-    const { junctionId } = pref;
-    return null;
-  }
-  return null;
-}
-function deriveSourceTraceIdFromMatchAdaptPath({
-  path,
-  db,
-  layoutConnMap
-}) {
-  let bestRef = getConnectivityNetIdFromPortRef(path.to, db) ?? getConnectivityNetIdFromPortRef(path.from, db);
-  if (!bestRef) {
-    const layoutConnNetId = layoutConnMap.getNetConnectedToId(
-      getRefKey(path.to)
-    );
-    const layoutConnectedRefs = layoutConnMap.getIdsConnectedToNet(layoutConnNetId).map((prefStr) => parseRefKey(prefStr));
-    bestRef = layoutConnectedRefs.map((ref) => getConnectivityNetIdFromPortRef(ref, db)).find(Boolean);
-  }
-  if (!bestRef?.subcircuit_connectivity_map_key) {
-    throw new Error(
-      `No connectivity net id found for match-adapt path ${JSON.stringify(path)}`
-    );
-  }
-  const sourceTraces = db.source_trace.list({
-    subcircuit_connectivity_map_key: bestRef.subcircuit_connectivity_map_key
-  });
-  for (const sourceTrace of sourceTraces) {
-    if (sourceTrace.connected_source_port_ids.includes(bestRef.source_port_id)) {
-      return sourceTrace.source_trace_id;
-    }
-  }
-  if (sourceTraces.length > 0) {
-    return sourceTraces[0].source_trace_id;
-  }
-  throw new Error(
-    `No source trace found for match-adapt path "${JSON.stringify(path)}"`
-  );
-}
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
-import { cju } from "@tscircuit/circuit-json-util";
-import { ConnectivityMap as ConnectivityMap2 } from "circuit-json-to-connectivity-map";
+import "@tscircuit/circuit-json-util";
+import "circuit-json-to-connectivity-map";
+import corpus from "@tscircuit/schematic-corpus/dist/bundled-bpc-graphs.json";
+import { convertCircuitJsonToBpc } from "circuit-json-to-bpc";
+import {
+  assignFloatingBoxPositions,
+  netAdaptBpcGraph,
+  getBpcGraphWlDistance
+} from "bpc-graph";
+import "@tscircuit/circuit-json-util";
 function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const { db } = group.root;
-  let subtreeCircuitJson = structuredClone(db.toArray());
-  subtreeCircuitJson = reorderChipPinsToCcw(subtreeCircuitJson);
-  const inputNetlist = convertCircuitJsonToInputNetlist(subtreeCircuitJson);
-  const templateFns = group._parsedProps.matchAdaptTemplate ? [
-    () => circuitBuilderFromLayoutJson(
-      group._parsedProps.matchAdaptTemplate
-    )
-  ] : void 0;
-  const solver = new SchematicLayoutPipelineSolver({
-    inputNetlist,
-    templateFns
-  });
-  let solvedLayout = null;
-  try {
-    solver.solve();
-    solvedLayout = solver.getLayout();
-  } catch (e) {
-    db.schematic_layout_error.insert({
-      message: `Match-adapt layout failed: ${e.toString()}`,
-      error_type: "schematic_layout_error",
-      source_group_id: group.source_group_id,
-      schematic_group_id: group.schematic_group_id
-    });
-    return;
-  }
-  const { boxes, junctions, netLabels, paths } = solvedLayout;
-  const layoutConnMap = new ConnectivityMap2({});
-  for (const path of paths) {
-    layoutConnMap.addConnections([[getRefKey2(path.from), getRefKey2(path.to)]]);
-  }
-  for (const junction of junctions) {
-    for (const path of paths) {
-      for (const pathPoint of path.points) {
-        if (Math.abs(pathPoint.x - junction.x) < 1e-3 && Math.abs(pathPoint.y - junction.y) < 1e-3) {
-          layoutConnMap.addConnections([
-            [getRefKey2(path.from), getRefKey2(junction)],
-            [getRefKey2(path.to), getRefKey2(junction)]
-          ]);
-        }
-      }
+  const subtreeCircuitJson = structuredClone(db.toArray());
+  const existingLabels = new Set(
+    subtreeCircuitJson.filter((e) => e.type === "schematic_net_label").map((e) => `${e.anchor_position?.x},${e.anchor_position?.y}`)
+  );
+  const oppositeSideFromFacing = {
+    left: "right",
+    right: "left",
+    top: "bottom",
+    bottom: "top"
+  };
+  const generatedNetLabels = /* @__PURE__ */ new Map();
+  for (const sp of subtreeCircuitJson.filter(
+    (e) => e.type === "schematic_port"
+  )) {
+    const key = `${sp.center.x},${sp.center.y}`;
+    if (existingLabels.has(key)) continue;
+    const srcPort = db.source_port.get(sp.source_port_id);
+    const srcNet = db.source_net.getWhere({
+      subcircuit_connectivity_map_key: srcPort?.subcircuit_connectivity_map_key
+    });
+    if (!srcNet) {
+      console.error(`No source net found for port: ${sp.source_port_id}`);
+      continue;
     }
-  }
-  for (const box of boxes) {
-    const srcComp = db.source_component.list().find((c) => c.name === box.boxId);
-    if (!srcComp) continue;
-    const schComp = db.schematic_component.getWhere({
-      source_component_id: srcComp.source_component_id
-    });
-    if (!schComp) continue;
-    const schCompMoveDelta = {
-      x: box.centerX - schComp.center.x + 0.1,
-      // TODO figure out why +0.1
-      y: box.centerY - schComp.center.y - 0.1
+    const srcTrace = db.source_trace.getWhere({
+      subcircuit_connectivity_map_key: srcPort?.subcircuit_connectivity_map_key
+    });
+    const schematic_net_label_id = `netlabel_for_${sp.schematic_port_id}`;
+    const source_net = db.source_net.get(srcNet.source_net_id);
+    const schematic_net_label = {
+      type: "schematic_net_label",
+      schematic_net_label_id,
+      text: source_net.name,
+      source_net_id: srcNet.source_net_id,
+      source_trace_id: srcTrace?.source_trace_id,
+      anchor_position: { ...sp.center },
+      center: { ...sp.center },
+      anchor_side: oppositeSideFromFacing[sp.facing_direction] ?? "right"
     };
-    db.schematic_component.update(schComp.schematic_component_id, {
-      center: {
-        x: schComp.center.x + schCompMoveDelta.x,
-        y: schComp.center.y + schCompMoveDelta.y
-      }
+    generatedNetLabels.set(schematic_net_label_id, {
+      schematic_net_label,
+      schematic_port: sp
     });
-    const schematicPorts = db.schematic_port.list({
-      schematic_component_id: schComp.schematic_component_id
-    });
-    for (const schematicPort of schematicPorts) {
-      db.schematic_port.update(schematicPort.schematic_port_id, {
-        center: {
-          x: schematicPort.center.x + schCompMoveDelta.x,
-          y: schematicPort.center.y + schCompMoveDelta.y
-        }
-      });
-    }
-    const schematicTexts = db.schematic_text.list({
-      schematic_component_id: schComp.schematic_component_id
-    });
-    for (const schematicText of schematicTexts) {
-      db.schematic_text.update(schematicText.schematic_text_id, {
-        position: {
-          x: schematicText.position.x + schCompMoveDelta.x,
-          y: schematicText.position.y + schCompMoveDelta.y
-        }
-      });
-    }
+    subtreeCircuitJson.push(schematic_net_label);
   }
-  for (const nl of netLabels) {
-    const srcNet = db.source_net.list().find((n) => n.name === nl.netId);
-    db.schematic_net_label.insert({
-      text: nl.netId,
-      source_net_id: srcNet?.source_net_id,
-      anchor_position: { x: nl.x, y: nl.y },
-      center: computeSchematicNetLabelCenter({
-        anchor_position: { x: nl.x, y: nl.y },
-        anchor_side: nl.anchorPosition,
-        text: nl.netId
-      }),
-      anchor_side: nl.anchorPosition
-    });
+  const targetBpcGraph = convertCircuitJsonToBpc(subtreeCircuitJson);
+  for (const box of targetBpcGraph.boxes) {
+    if (box.kind === "fixed" || box.center) {
+      box.kind = "floating";
+      box.center = void 0;
+    }
   }
-  for (const path of paths) {
-    if (!path.points || path.points.length < 2) continue;
-    const sourceTraceId = deriveSourceTraceIdFromMatchAdaptPath({
-      path,
-      db: cju(subtreeCircuitJson),
-      layoutConnMap
-    });
-    let edges = [];
-    for (let i = 0; i < path.points.length - 1; i++) {
-      edges.push({
-        from: {
-          x: path.points[i].x,
-          y: path.points[i].y
-        },
-        to: {
-          x: path.points[i + 1].x,
-          y: path.points[i + 1].y
-        }
+  let bestMatch = {
+    boxes: [],
+    pins: []
+  };
+  let bestWlDistance = Infinity;
+  let winningBpcGraphName = "empty";
+  for (const [candidateBpcGraphName, candidateBpcGraph] of Object.entries(
+    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 schematic_component2 = db.schematic_component.get(box.boxId);
+    if (schematic_component2) {
+      const ports = db.schematic_port.list({
+        schematic_component_id: schematic_component2.schematic_component_id
       });
-    }
-    const otherCrossingEdges = getOtherSchematicTraces({
-      db,
-      source_trace_id: sourceTraceId,
-      differentNetOnly: true
-    }).flatMap((t) => t.edges);
-    if (otherCrossingEdges.length > 0) {
-      edges = createSchematicTraceCrossingSegments({
-        edges,
-        otherEdges: otherCrossingEdges
+      const texts = db.schematic_text.list({
+        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
+      };
+      for (const port of ports) {
+        port.center.x += positionDelta.x;
+        port.center.y += positionDelta.y;
+      }
+      for (const text of texts) {
+        text.position.x += positionDelta.x;
+        text.position.y += positionDelta.y;
+      }
+      schematic_component2.center.x += positionDelta.x;
+      schematic_component2.center.y += positionDelta.y;
+      continue;
     }
-    const junctions2 = createSchematicTraceJunctions({
-      edges,
-      db,
-      source_trace_id: sourceTraceId
-    });
-    db.schematic_trace.insert({
-      source_trace_id: sourceTraceId,
-      edges,
-      junctions: junctions2
-    });
+    const schematic_net_label = db.schematic_net_label.get(box.boxId);
+    if (schematic_net_label) {
+      const pin = adaptedBpcGraphWithPositions.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;
+      schematic_net_label.anchor_position = {
+        x: box.center.x + pin.offset.x,
+        y: box.center.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 center = pins.find((p) => p.color === "netlabel_center");
+      const anchor = pins.find((p) => p.color !== "netlabel_center");
+      const color = anchor.color;
+      const symbolName = color === "vcc" ? "vcc" : color === "gnd" ? "gnd" : void 0;
+      const anchorSide = color === "vcc" ? "bottom" : color === "gnd" ? "top" : oppositeSideFromFacing[schematic_port.facing_direction] ?? "right";
+      const source_net = db.source_net.get(generatedNetLabel.source_net_id);
+      const schematic_net_label2 = {
+        type: "schematic_net_label",
+        schematic_net_label_id: `netlabel_for_${box.boxId}`,
+        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
+        },
+        center: {
+          x: box.center.x + center.offset.x,
+          y: box.center.y + center.offset.y
+        },
+        anchor_side: anchorSide,
+        symbol_name: symbolName,
+        source_net_id: generatedNetLabel.source_net_id,
+        source_trace_id: generatedNetLabel.source_trace_id
+      };
+      db.schematic_net_label.insert(schematic_net_label2);
+      continue;
+    }
+    console.error(
+      `No schematic element found for box: ${box.boxId}. This is a bug in the matchAdapt binding with @tscircuit/core`
+    );
   }
 }
 
@@ -10708,7 +10670,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.532",
+  version: "0.0.533",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10733,7 +10695,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.75",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.49",
+    "@tscircuit/circuit-json-util": "^0.0.50",
     "@tscircuit/footprinter": "^0.0.186",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -10742,6 +10704,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.246",
     "@tscircuit/schematic-autolayout": "^0.0.6",
+    "@tscircuit/schematic-corpus": "^0.0.29",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -10749,15 +10712,18 @@ 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",
     "bun-match-svg": "0.0.11",
+    "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.212",
+    "circuit-json-to-bpc": "^0.0.7",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.162",
     concurrently: "^9.1.2",
     debug: "^4.3.6",
-    "graphics-debug": "^0.0.4",
+    "graphics-debug": "^0.0.57",
     howfat: "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
@@ -10778,6 +10744,9 @@ var package_default = {
     "@tscircuit/props": "*",
     "@tscircuit/schematic-autolayout": "*",
     "@tscircuit/schematic-match-adapt": "*",
+    "@tscircuit/schematic-corpus": "*",
+    "circuit-json-to-bpc": "*",
+    "bpc-graph": "*",
     "circuit-json": "*",
     "circuit-json-to-connectivity-map": "*",
     "schematic-symbols": "*",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.533",
+  "version": "0.0.534",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -26,7 +26,7 @@
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.75",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.49",
+    "@tscircuit/circuit-json-util": "^0.0.50",
     "@tscircuit/footprinter": "^0.0.186",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -35,6 +35,7 @@
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.246",
     "@tscircuit/schematic-autolayout": "^0.0.6",
+    "@tscircuit/schematic-corpus": "^0.0.29",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -42,15 +43,18 @@
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
+    "bpc-graph": "^0.0.16",
     "bun-match-svg": "0.0.11",
+    "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.212",
+    "circuit-json-to-bpc": "^0.0.7",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.162",
     "concurrently": "^9.1.2",
     "debug": "^4.3.6",
-    "graphics-debug": "^0.0.4",
+    "graphics-debug": "^0.0.57",
     "howfat": "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
@@ -71,6 +75,9 @@
     "@tscircuit/props": "*",
     "@tscircuit/schematic-autolayout": "*",
     "@tscircuit/schematic-match-adapt": "*",
+    "@tscircuit/schematic-corpus": "*",
+    "circuit-json-to-bpc": "*",
+    "bpc-graph": "*",
     "circuit-json": "*",
     "circuit-json-to-connectivity-map": "*",
     "schematic-symbols": "*",