@tscircuit/core 0.0.551 → 0.0.553

package/dist/index.js

@@ -6661,7 +6661,7 @@ var CapacityMeshAutorouter = class {
 
 // lib/components/primitive-components/Group/Group.ts
 import "circuit-json";
-import Debug5 from "debug";
+import Debug6 from "debug";
 import "zod";
 
 // lib/components/primitive-components/TraceHint.ts
@@ -7298,76 +7298,53 @@ 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 corpus from "@tscircuit/schematic-corpus";
+import { corpusNoNetLabel } from "@tscircuit/schematic-corpus";
 import { convertCircuitJsonToBpc } from "circuit-json-to-bpc";
-import {
-  layoutSchematicGraph
-} from "bpc-graph";
+import { layoutSchematicGraph, getGraphicsForBpcGraph } from "bpc-graph";
+import Debug5 from "debug";
+var debug4 = Debug5("Group_doInitialSchematicLayoutMatchAdapt");
 function Group_doInitialSchematicLayoutMatchAdapt(group) {
   const { db } = group.root;
   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;
-    }
-    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"
-    };
-    generatedNetLabels.set(schematic_net_label_id, {
-      schematic_net_label,
-      schematic_port: sp
-    });
-    subtreeCircuitJson.push(schematic_net_label);
+  const bpcGraphBeforeGeneratedNetLabels = convertCircuitJsonToBpc(subtreeCircuitJson);
+  console.log("Writing bpcGraphBeforeGeneratedNetLabels.svg");
+  if (debug4.enabled) {
+    global.debugGraphics?.push(
+      getGraphicsForBpcGraph(bpcGraphBeforeGeneratedNetLabels, {
+        title: "floatingBpcGraph"
+      })
+    );
   }
-  const targetBpcGraph = convertCircuitJsonToBpc(subtreeCircuitJson);
+  const targetBpcGraph = convertCircuitJsonToBpc(
+    subtreeCircuitJson
+    // .concat(implicitNetLabels),
+  );
   const laidOutBpcGraph = layoutSchematicGraph(targetBpcGraph, {
     singletonKeys: ["vcc/2", "gnd/2"],
     centerPinColors: ["netlabel_center", "component_center"],
-    corpus
+    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
   });
+  if (debug4.enabled) {
+    global.debugGraphics?.push(
+      getGraphicsForBpcGraph(laidOutBpcGraph, {
+        title: "laidOutBpcGraph"
+      })
+    );
+  }
   const groupOffset = group._getGlobalSchematicPositionBeforeLayout();
   for (const box of laidOutBpcGraph.boxes) {
     if (!box.center) continue;
@@ -7417,36 +7394,6 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
       };
       continue;
     }
-    if (generatedNetLabels.has(box.boxId)) {
-      const { schematic_net_label: generatedNetLabel, schematic_port } = generatedNetLabels.get(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;
-      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 + groupOffset.x + center.offset.x,
-          y: box.center.y + groupOffset.y + center.offset.y
-        },
-        center: {
-          x: box.center.x + groupOffset.x + center.offset.x,
-          y: box.center.y + groupOffset.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`
     );
@@ -7454,12 +7401,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(
@@ -7947,20 +7894,20 @@ var Group = class extends NormalComponent {
     return false;
   }
   _hasTracesToRoute() {
-    const debug4 = Debug5("tscircuit:core:_hasTracesToRoute");
+    const debug5 = Debug6("tscircuit:core:_hasTracesToRoute");
     const traces = this.selectAll("trace");
-    debug4(`[${this.getString()}] has ${traces.length} traces to route`);
+    debug5(`[${this.getString()}] has ${traces.length} traces to route`);
     return traces.length > 0;
   }
   async _runEffectMakeHttpAutoroutingRequest() {
     const { db } = this.root;
-    const debug4 = Debug5("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
+    const debug5 = Debug6("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
     const props = this._parsedProps;
     const autorouterConfig = this._getAutorouterConfig();
     const serverUrl = autorouterConfig.serverUrl;
     const serverMode = autorouterConfig.serverMode;
     const fetchWithDebug = (url, options) => {
-      debug4("fetching", url);
+      debug5("fetching", url);
       if (options.headers) {
         options.headers["Tscircuit-Core-Version"] = this.root?.getCoreVersion();
       }
@@ -8076,8 +8023,8 @@ var Group = class extends NormalComponent {
   async _runLocalAutorouting() {
     const { db } = this.root;
     const props = this._parsedProps;
-    const debug4 = Debug5("tscircuit:core:_runLocalAutorouting");
-    debug4(`[${this.getString()}] starting local autorouting`);
+    const debug5 = Debug6("tscircuit:core:_runLocalAutorouting");
+    debug5(`[${this.getString()}] starting local autorouting`);
     const autorouterConfig = this._getAutorouterConfig();
     const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
       db,
@@ -8102,11 +8049,11 @@ var Group = class extends NormalComponent {
     const routingPromise = new Promise(
       (resolve, reject) => {
         autorouter.on("complete", (event) => {
-          debug4(`[${this.getString()}] local autorouting complete`);
+          debug5(`[${this.getString()}] local autorouting complete`);
           resolve(event.traces);
         });
         autorouter.on("error", (event) => {
-          debug4(
+          debug5(
             `[${this.getString()}] local autorouting error: ${event.error.message}`
           );
           reject(event.error);
@@ -8163,30 +8110,30 @@ var Group = class extends NormalComponent {
     }
   }
   doInitialPcbTraceRender() {
-    const debug4 = Debug5("tscircuit:core:doInitialPcbTraceRender");
+    const debug5 = Debug6("tscircuit:core:doInitialPcbTraceRender");
     if (!this.isSubcircuit) return;
     if (this.root?.pcbDisabled) return;
     if (this.getInheritedProperty("routingDisabled")) return;
     if (this._shouldUseTraceByTraceRouting()) return;
     if (!this._areChildSubcircuitsRouted()) {
-      debug4(
+      debug5(
         `[${this.getString()}] child subcircuits are not routed, skipping async autorouting until subcircuits routed`
       );
       return;
     }
-    debug4(
+    debug5(
       `[${this.getString()}] no child subcircuits to wait for, initiating async routing`
     );
     if (!this._hasTracesToRoute()) return;
     this._startAsyncAutorouting();
   }
   updatePcbTraceRender() {
-    const debug4 = Debug5("tscircuit:core:updatePcbTraceRender");
-    debug4(`[${this.getString()}] updating...`);
+    const debug5 = Debug6("tscircuit:core:updatePcbTraceRender");
+    debug5(`[${this.getString()}] updating...`);
     if (!this.isSubcircuit) return;
     if (this._shouldRouteAsync() && this._hasTracesToRoute() && !this._hasStartedAsyncAutorouting) {
       if (this._areChildSubcircuitsRouted()) {
-        debug4(
+        debug5(
           `[${this.getString()}] child subcircuits are now routed, starting async autorouting`
         );
         this._startAsyncAutorouting();
@@ -8197,14 +8144,14 @@ var Group = class extends NormalComponent {
     if (this._shouldUseTraceByTraceRouting()) return;
     const { db } = this.root;
     if (this._asyncAutoroutingResult.output_simple_route_json) {
-      debug4(
+      debug5(
         `[${this.getString()}] updating PCB traces from simple route json (${this._asyncAutoroutingResult.output_simple_route_json.traces?.length} traces)`
       );
       this._updatePcbTraceRenderFromSimpleRouteJson();
       return;
     }
     if (this._asyncAutoroutingResult.output_pcb_traces) {
-      debug4(
+      debug5(
         `[${this.getString()}] updating PCB traces from ${this._asyncAutoroutingResult.output_pcb_traces.length} traces`
       );
       this._updatePcbTraceRenderFromPcbTraces();
@@ -10748,7 +10695,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.550",
+  version: "0.0.552",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10782,7 +10729,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.251",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "@tscircuit/schematic-corpus": "^0.0.50",
+    "@tscircuit/schematic-corpus": "^0.0.52",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -10790,18 +10737,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.50",
+    "bpc-graph": "^0.0.53",
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.215",
-    "circuit-json-to-bpc": "^0.0.7",
+    "circuit-json-to-bpc": "^0.0.13",
     "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.57",
+    "graphics-debug": "^0.0.60",
     howfat: "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "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",
@@ -35,7 +35,7 @@
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.251",
     "@tscircuit/schematic-autolayout": "^0.0.6",
-    "@tscircuit/schematic-corpus": "^0.0.50",
+    "@tscircuit/schematic-corpus": "^0.0.52",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "^1.2.16",
@@ -43,18 +43,18 @@
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
     "@types/react-reconciler": "^0.28.9",
-    "bpc-graph": "^0.0.50",
+    "bpc-graph": "^0.0.53",
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.5",
     "chokidar-cli": "^3.0.0",
     "circuit-json": "^0.0.215",
-    "circuit-json-to-bpc": "^0.0.7",
+    "circuit-json-to-bpc": "^0.0.13",
     "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.57",
+    "graphics-debug": "^0.0.60",
     "howfat": "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",