Migrate the Fixed-via-topology from tscircuit/hypergraph to tscircuit/fixed-via-hypergraph-solver

Author: AnasSarkiz

lib/solvers/FixedTopologyHighDensityIntraNodeSolver/FixedTopologyHighDensityIntraNodeSolver.ts

@@ -5,10 +5,11 @@ import {
   type ViaData,
   type ViaByNet,
   type ViaTile,
-  ViaGraphSolver,
+  FixedViaHypergraphSolver,
   createConvexViaGraphFromXYConnections,
-} from "@tscircuit/hypergraph"
+} from "@tscircuit/fixed-via-hypergraph-solver/lib/index"
 import { ConnectivityMap } from "circuit-json-to-connectivity-map"
+import type { GraphicsObject } from "graphics-debug"
 import type {
   HighDensityIntraNodeRoute,
   NodeWithPortPoints,
@@ -54,7 +55,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
   connMap?: ConnectivityMap
 
   rootConnectionNameByConnectionId: Map<string, string | undefined> = new Map()
-  lastActiveSubSolver: ViaGraphSolver | null = null
+  lastActiveSubSolver: FixedViaHypergraphSolver | null = null
 
   solvedRoutes: HighDensityIntraNodeRouteWithVias[] = []
   vias: ViaRegion[] = []
@@ -96,7 +97,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     return 0.3
   }
 
-  private _initializeGraph(): ViaGraphSolver | null {
+  private _initializeGraph(): FixedViaHypergraphSolver | null {
     // Build connections from port points
     const connectionMap = new Map<
       string,
@@ -136,7 +137,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     const convexGraph = createConvexViaGraphFromXYConnections(inputConnections)
     this.tiledViasByNet = convexGraph.viaTile.viasByNet ?? {}
 
-    return new ViaGraphSolver({
+    return new FixedViaHypergraphSolver({
       inputGraph: {
         regions: convexGraph.regions,
         ports: convexGraph.ports,
@@ -147,7 +148,8 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
   }
 
   _step() {
-    let activeSubSolver = this.activeSubSolver as ViaGraphSolver | null
+    let activeSubSolver = this
+      .activeSubSolver as FixedViaHypergraphSolver | null
     if (!activeSubSolver) {
       activeSubSolver = this._initializeGraph()
       if (!activeSubSolver) {
@@ -405,7 +407,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     )
   }
 
-  private _processResults(viaGraphSolver: ViaGraphSolver) {
+  private _processResults(viaGraphSolver: FixedViaHypergraphSolver) {
     this.solvedRoutes = []
     const viaTile = viaGraphSolver.viaTile
     const fallbackViaDiameter = viaTile
@@ -588,7 +590,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     return this.vias
   }
 
-  override visualize() {
+  override visualize(): GraphicsObject {
     if (this.activeSubSolver) {
       return this.activeSubSolver.visualize()
     }

package.json

@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "start": "cosmos",
-    "build": "tsup ./lib/index.ts --minify terser --external @tscircuit/core --external circuit-to-svg --format esm --dts --sourcemap",
+    "build": "tsup ./lib/index.ts --minify terser --external @tscircuit/core --external circuit-to-svg --external @tscircuit/fixed-via-hypergraph-solver/lib/index --format esm --dts --sourcemap",
     "bench": "bun test tests/spatial-index-bench.test.ts",
     "format": "biome format --write .",
     "format:check": "biome format .",
@@ -28,6 +28,7 @@
     "@tscircuit/circuit-json-util": "^0.0.90",
     "@tscircuit/core": "^0.0.337",
     "@tscircuit/curvy-trace-solver": "^0.0.10",
+    "@tscircuit/fixed-via-hypergraph-solver": "github:tscircuit/fixed-via-hypergraph-solver#7bd62d7db34f18d5ed892a8fce36dea59bf95b55",
     "@tscircuit/hypergraph": "^0.0.71",
     "@tscircuit/dataset-srj05": "git+https://github.com/tscircuit/dataset-srj05.git#9a49c126a89c083dc4d2b72cd17184735f637762",
     "@tscircuit/jumper-topology-generator": "^0.0.4",