@tscircuit/core 0.0.552 → 0.0.554

package/dist/index.js

@@ -7298,35 +7298,21 @@ var normalizePinLabels = (inputPinLabels) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
-import "@tscircuit/schematic-match-adapt";
-import "@tscircuit/schematic-match-adapt";
-
-// lib/utils/schematic/deriveSourceTraceIdFromMatchAdaptPath.ts
-import {
-  getRefKey,
-  parseRefKey
-} from "@tscircuit/schematic-match-adapt";
-
-// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
-import "@tscircuit/circuit-json-util";
-import "circuit-json-to-connectivity-map";
 import { corpusNoNetLabel } from "@tscircuit/schematic-corpus";
+import { convertCircuitJsonToBpc } from "circuit-json-to-bpc";
 import {
-  convertCircuitJsonToBpc
-} from "circuit-json-to-bpc";
-import {
-  layoutSchematicGraph,
-  getGraphicsForBpcGraph
+  getGraphicsForBpcGraph,
+  layoutSchematicGraphVariants
 } from "bpc-graph";
-import "graphics-debug";
-import "circuit-to-svg";
 import Debug5 from "debug";
+import { buildSubtree } from "@tscircuit/circuit-json-util";
 var debug4 = Debug5("Group_doInitialSchematicLayoutMatchAdapt");
 function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const { db } = group.root;
-  const subtreeCircuitJson = structuredClone(db.toArray());
+  const subtreeCircuitJson = buildSubtree(db.toArray(), {
+    source_group_id: group.source_group_id
+  });
   const bpcGraphBeforeGeneratedNetLabels = convertCircuitJsonToBpc(subtreeCircuitJson);
-  console.log("Writing bpcGraphBeforeGeneratedNetLabels.svg");
   if (debug4.enabled) {
     global.debugGraphics?.push(
       getGraphicsForBpcGraph(bpcGraphBeforeGeneratedNetLabels, {
@@ -7334,29 +7320,45 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
       })
     );
   }
-  const targetBpcGraph = convertCircuitJsonToBpc(
+  const floatingGraph = convertCircuitJsonToBpc(
     subtreeCircuitJson
     // .concat(implicitNetLabels),
   );
-  const laidOutBpcGraph = layoutSchematicGraph(targetBpcGraph, {
-    singletonKeys: ["vcc/2", "gnd/2"],
-    centerPinColors: ["netlabel_center", "component_center"],
-    floatingBoxIdsWithMutablePinOffsets: new Set(
-      targetBpcGraph.boxes.filter((box) => {
-        const boxPins = targetBpcGraph.pins.filter(
-          (p) => p.boxId === box.boxId
-        );
-        const nonCenterBoxPins = boxPins.filter(
-          (bp) => !bp.color.includes("center")
-        );
-        if (nonCenterBoxPins.length <= 2) {
-          return true;
-        }
-        return false;
-      }).map((b) => b.boxId)
-    ),
-    corpus: corpusNoNetLabel
-  });
+  const floatingGraphNoNotConnected = {
+    boxes: floatingGraph.boxes,
+    pins: floatingGraph.pins.map((p) => ({
+      ...p,
+      color: p.color.replace("not_connected", "normal")
+    }))
+  };
+  const { result: laidOutBpcGraph } = layoutSchematicGraphVariants(
+    [
+      { variantName: "default", floatingGraph },
+      {
+        variantName: "noNotConnected",
+        floatingGraph: floatingGraphNoNotConnected
+      }
+    ],
+    {
+      singletonKeys: ["vcc/2", "gnd/2"],
+      centerPinColors: ["netlabel_center", "component_center"],
+      floatingBoxIdsWithMutablePinOffsets: new Set(
+        floatingGraph.boxes.filter((box) => {
+          const boxPins = floatingGraph.pins.filter(
+            (p) => p.boxId === box.boxId
+          );
+          const nonCenterBoxPins = boxPins.filter(
+            (bp) => !bp.color.includes("center")
+          );
+          if (nonCenterBoxPins.length <= 2) {
+            return true;
+          }
+          return false;
+        }).map((b) => b.boxId)
+      ),
+      corpus: corpusNoNetLabel
+    }
+  );
   if (debug4.enabled) {
     global.debugGraphics?.push(
       getGraphicsForBpcGraph(laidOutBpcGraph, {
@@ -7420,12 +7422,12 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSourceAddConnectivityMapKey.ts
-import { ConnectivityMap as ConnectivityMap3 } from "circuit-json-to-connectivity-map";
+import { ConnectivityMap as ConnectivityMap2 } from "circuit-json-to-connectivity-map";
 function Group_doInitialSourceAddConnectivityMapKey(group) {
   if (!group.isSubcircuit) return;
   const { db } = group.root;
   const traces = group.selectAll("trace");
-  const connMap = new ConnectivityMap3({});
+  const connMap = new ConnectivityMap2({});
   connMap.addConnections(
     traces.map((t) => {
       const source_trace = db.source_trace.get(
@@ -10714,7 +10716,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.551",
+  version: "0.0.553",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10739,7 +10741,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@tscircuit/capacity-autorouter": "^0.0.93",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.50",
+    "@tscircuit/circuit-json-util": "^0.0.51",
     "@tscircuit/footprinter": "^0.0.189",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -10756,7 +10758,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.53",
+    "bpc-graph": "^0.0.57",
     "bun-match-svg": "0.0.12",
     "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.552",
+  "version": "0.0.554",
   "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.93",
     "@tscircuit/checks": "^0.0.52",
-    "@tscircuit/circuit-json-util": "^0.0.50",
+    "@tscircuit/circuit-json-util": "^0.0.51",
     "@tscircuit/footprinter": "^0.0.189",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -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.53",
+    "bpc-graph": "^0.0.57",
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",