@tscircuit/hypergraph 0.0.38 → 0.0.39

package/dist/index.d.ts

@@ -662,16 +662,16 @@ var viasByNet = {
 			viaId: "79364d38-c966-4eff-aa4a-e3ff6cca6339",
 			diameter: 0.6,
 			position: {
-				x: -0.8,
-				y: -1.893395
+				x: -0.695585,
+				y: -1.475
 			}
 		},
 		{
 			viaId: "f1d52fd5-ddd2-4440-8772-da3d096b033f",
 			diameter: 0.6,
 			position: {
-				x: -0.703066,
-				y: 1.2
+				x: -0.428066,
+				y: 1.185303
 			}
 		}
 	],
@@ -680,24 +680,24 @@ var viasByNet = {
 			viaId: "4e57cee8-0910-4c83-9ec1-1ed2c9d16dcc",
 			diameter: 0.6,
 			position: {
-				x: 1.268717,
-				y: -1.698536
+				x: 0.981466,
+				y: -1.472559
 			}
 		},
 		{
 			viaId: "a3797f13-73f9-48c3-a448-bea3980cdd65",
 			diameter: 0.6,
 			position: {
-				x: -1.115754,
-				y: -0.799377
+				x: -1.276,
+				y: -0.834191
 			}
 		},
 		{
 			viaId: "b0c56bb1-ea80-4154-9bb7-cb0fd760de8f",
 			diameter: 0.6,
 			position: {
-				x: 0.397934,
-				y: 1.458567
+				x: 0.685025,
+				y: 1.338478
 			}
 		}
 	],
@@ -706,8 +706,8 @@ var viasByNet = {
 			viaId: "3719876b-17c8-4ee3-9cce-5b5c073d6614",
 			diameter: 0.6,
 			position: {
-				x: 1.186721,
-				y: 1.32508
+				x: 1.434987,
+				y: 1.330707
 			}
 		},
 		{
@@ -722,8 +722,8 @@ var viasByNet = {
 			viaId: "63afce65-b94e-47da-ae14-51ff0ee8eb39",
 			diameter: 0.6,
 			position: {
-				x: 1.655408,
-				y: -0.998198
+				x: 1.478363,
+				y: -0.910782
 			}
 		}
 	],
@@ -740,16 +740,16 @@ var viasByNet = {
 			viaId: "548acbca-8b68-4186-a589-681ec44fba42",
 			diameter: 0.6,
 			position: {
-				x: 0.222457,
-				y: -1.866711
+				x: 0.251271,
+				y: -1.643783
 			}
 		},
 		{
 			viaId: "d6bf60bf-4b90-4967-a295-fc930b1f2549",
 			diameter: 0.6,
 			position: {
-				x: -1.419706,
-				y: 0.868747
+				x: -1.168748,
+				y: 1.067434
 			}
 		}
 	]
@@ -766,28 +766,28 @@ var routeSegments = [
 				y: 0.582296
 			},
 			{
-				x: 1.712721,
-				y: 0.811183
+				x: 1.960987,
+				y: 1.059449
 			},
 			{
-				x: 1.712721,
-				y: 1.542957
+				x: 1.960987,
+				y: 1.548584
 			},
 			{
-				x: 0.920111,
-				y: 2.335567
+				x: 1.344093,
+				y: 2.165478
 			},
 			{
-				x: 0.034666,
-				y: 2.335566
+				x: 0.165478,
+				y: 2.165478
 			},
 			{
-				x: -0.703066,
-				y: 1.597834
+				x: -0.428066,
+				y: 1.571934
 			},
 			{
-				x: -0.703066,
-				y: 1.2
+				x: -0.428066,
+				y: 1.185303
 			}
 		]
 	},
@@ -798,32 +798,64 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: -0.8,
-				y: -1.893395
+				x: -0.695585,
+				y: -1.475
+			},
+			{
+				x: -0.810394,
+				y: -1.360191
+			},
+			{
+				x: -1.493877,
+				y: -1.360191
+			},
+			{
+				x: -1.80445,
+				y: -1.049618
+			},
+			{
+				x: -1.80445,
+				y: 0.214427
+			},
+			{
+				x: -1.801,
+				y: 0.210977
 			},
 			{
-				x: -1.706605,
-				y: -1.893395
+				x: -1.801,
+				y: 0.217877
 			},
 			{
-				x: -2.10103,
-				y: -1.49897
+				x: -1.492877,
+				y: 0.526
 			},
 			{
-				x: -2.10103,
-				y: 1.002011
+				x: -1.057123,
+				y: 0.526
 			},
 			{
-				x: -1.708294,
-				y: 1.394747
+				x: -0.849428,
+				y: 0.318305
 			},
 			{
-				x: -0.897813,
-				y: 1.394747
+				x: -0.5,
+				y: 0.667733
 			},
 			{
-				x: -0.703066,
-				y: 1.2
+				x: -0.5,
+				y: 0.678735
+			},
+			{
+				x: -0.479066,
+				y: 0.699669
+			},
+			{
+				x: -0.479066,
+				y: 1.134303
+			},
+			{
+				x: -0.428066,
+				y: 1.185303
 			}
 		]
 	},
@@ -834,16 +866,16 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: 1.268717,
-				y: -1.698536
+				x: 0.981466,
+				y: -1.472559
 			},
 			{
-				x: 0.369558,
-				y: -0.799377
+				x: 0.343098,
+				y: -0.834191
 			},
 			{
-				x: -1.115754,
-				y: -0.799377
+				x: -1.276,
+				y: -0.834191
 			}
 		]
 	},
@@ -854,8 +886,20 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: -1.115754,
-				y: -0.799377
+				x: -1.276,
+				y: -0.834191
+			},
+			{
+				x: -1.156476,
+				y: -0.834191
+			},
+			{
+				x: -0.809571,
+				y: -0.487286
+			},
+			{
+				x: -0.803663,
+				y: -0.487286
 			},
 			{
 				x: 0.397934,
@@ -863,7 +907,11 @@ var routeSegments = [
 			},
 			{
 				x: 0.397934,
-				y: 1.458567
+				y: 1.051387
+			},
+			{
+				x: 0.685025,
+				y: 1.338478
 			}
 		]
 	},
@@ -874,24 +922,20 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: 1.186721,
-				y: 1.32508
-			},
-			{
-				x: 0.907834,
-				y: 1.046193
+				x: 1.434987,
+				y: 1.330707
 			},
 			{
-				x: 0.907834,
-				y: -0.261774
+				x: 0.957834,
+				y: 0.853554
 			},
 			{
-				x: 1.644258,
-				y: -0.998198
+				x: 0.957834,
+				y: -0.390253
 			},
 			{
-				x: 1.655408,
-				y: -0.998198
+				x: 1.478363,
+				y: -0.910782
 			}
 		]
 	},
@@ -902,31 +946,31 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: 1.186721,
-				y: 1.32508
+				x: 1.434987,
+				y: 1.330707
 			},
 			{
-				x: 1.186721,
-				y: 1.484368
+				x: 1.434987,
+				y: 1.332393
 			},
 			{
-				x: 0.636522,
-				y: 2.034567
+				x: 0.902902,
+				y: 1.864478
 			},
 			{
-				x: 0.159346,
-				y: 2.034567
+				x: 0.467148,
+				y: 1.864478
 			},
 			{
-				x: -0.178066,
-				y: 1.697155
+				x: 0.096934,
+				y: 1.494264
 			},
 			{
-				x: -0.178066,
-				y: 0.981123
+				x: 0.096934,
+				y: 0.838989
 			},
 			{
-				x: -1.159189,
+				x: -0.742055,
 				y: 0
 			},
 			{
@@ -946,28 +990,24 @@ var routeSegments = [
 				y: -0.164505
 			},
 			{
-				x: 1.565592,
-				y: -0.164505
-			},
-			{
-				x: 2.181408,
-				y: -0.780321
+				x: 2.004363,
+				y: -0.615839
 			},
 			{
-				x: 2.181408,
-				y: -1.600433
+				x: 2.004363,
+				y: -1.193539
 			},
 			{
-				x: 1.507305,
-				y: -2.274536
+				x: 1.197902,
+				y: -2
 			},
 			{
-				x: 0.630282,
-				y: -2.274536
+				x: 0.607488,
+				y: -2
 			},
 			{
-				x: 0.222457,
-				y: -1.866711
+				x: 0.251271,
+				y: -1.643783
 			}
 		]
 	},
@@ -978,56 +1018,32 @@ var routeSegments = [
 		layer: "bottom",
 		segments: [
 			{
-				x: 0.222457,
-				y: -1.866711
-			},
-			{
-				x: 0.137528,
-				y: -1.866711
-			},
-			{
-				x: -0.329183,
-				y: -1.4
-			},
-			{
-				x: -0.361788,
-				y: -1.367395
-			},
-			{
-				x: -1.017877,
-				y: -1.367395
-			},
-			{
-				x: -1.237643,
-				y: -1.587161
-			},
-			{
-				x: -1.587161,
-				y: -1.587161
+				x: 0.251271,
+				y: -1.643783
 			},
 			{
-				x: -1.8,
-				y: -1.374322
+				x: -0.105946,
+				y: -2.001
 			},
 			{
-				x: -1.8,
-				y: -1.036995
+				x: -1.278746,
+				y: -2.001
 			},
 			{
-				x: -1.80003,
-				y: -1.036965
+				x: -2.10545,
+				y: -1.174296
 			},
 			{
-				x: -1.80003,
-				y: -0.6
+				x: -2.10545,
+				y: 0.339105
 			},
 			{
-				x: -1.80003,
-				y: 0.488423
+				x: -1.377121,
+				y: 1.067434
 			},
 			{
-				x: -1.419706,
-				y: 0.868747
+				x: -1.168748,
+				y: 1.067434
 			}
 		]
 	}
@@ -1196,6 +1212,8 @@ type ConvexViaGraphFromXYConnectionsResult = JumperGraph & {
  * @param opts - Optional configuration
  */
 declare function createConvexViaGraphFromXYConnections(xyConnections: XYConnection[], viaTile?: ViaTile, opts?: {
+    tileWidth?: number;
+    tileHeight?: number;
     tileSize?: number;
     portPitch?: number;
     clearance?: number;
@@ -1259,6 +1277,8 @@ type Bounds = {
 declare function generateConvexViaTopologyRegions(opts: {
     viaTile: ViaTile;
     bounds: Bounds;
+    tileWidth?: number;
+    tileHeight?: number;
     tileSize?: number;
     portPitch?: number;
     clearance?: number;

package/dist/index.js

@@ -3779,16 +3779,16 @@ var via_tile_default = {
         viaId: "79364d38-c966-4eff-aa4a-e3ff6cca6339",
         diameter: 0.6,
         position: {
-          x: -0.8,
-          y: -1.893395
+          x: -0.695585,
+          y: -1.475
         }
       },
       {
         viaId: "f1d52fd5-ddd2-4440-8772-da3d096b033f",
         diameter: 0.6,
         position: {
-          x: -0.703066,
-          y: 1.2
+          x: -0.428066,
+          y: 1.185303
         }
       }
     ],
@@ -3797,24 +3797,24 @@ var via_tile_default = {
         viaId: "4e57cee8-0910-4c83-9ec1-1ed2c9d16dcc",
         diameter: 0.6,
         position: {
-          x: 1.268717,
-          y: -1.698536
+          x: 0.981466,
+          y: -1.472559
         }
       },
       {
         viaId: "a3797f13-73f9-48c3-a448-bea3980cdd65",
         diameter: 0.6,
         position: {
-          x: -1.115754,
-          y: -0.799377
+          x: -1.276,
+          y: -0.834191
         }
       },
       {
         viaId: "b0c56bb1-ea80-4154-9bb7-cb0fd760de8f",
         diameter: 0.6,
         position: {
-          x: 0.397934,
-          y: 1.458567
+          x: 0.685025,
+          y: 1.338478
         }
       }
     ],
@@ -3823,8 +3823,8 @@ var via_tile_default = {
         viaId: "3719876b-17c8-4ee3-9cce-5b5c073d6614",
         diameter: 0.6,
         position: {
-          x: 1.186721,
-          y: 1.32508
+          x: 1.434987,
+          y: 1.330707
         }
       },
       {
@@ -3839,8 +3839,8 @@ var via_tile_default = {
         viaId: "63afce65-b94e-47da-ae14-51ff0ee8eb39",
         diameter: 0.6,
         position: {
-          x: 1.655408,
-          y: -0.998198
+          x: 1.478363,
+          y: -0.910782
         }
       }
     ],
@@ -3857,16 +3857,16 @@ var via_tile_default = {
         viaId: "548acbca-8b68-4186-a589-681ec44fba42",
         diameter: 0.6,
         position: {
-          x: 0.222457,
-          y: -1.866711
+          x: 0.251271,
+          y: -1.643783
         }
       },
       {
         viaId: "d6bf60bf-4b90-4967-a295-fc930b1f2549",
         diameter: 0.6,
         position: {
-          x: -1.419706,
-          y: 0.868747
+          x: -1.168748,
+          y: 1.067434
         }
       }
     ]
@@ -3883,28 +3883,28 @@ var via_tile_default = {
           y: 0.582296
         },
         {
-          x: 1.712721,
-          y: 0.811183
+          x: 1.960987,
+          y: 1.059449
         },
         {
-          x: 1.712721,
-          y: 1.542957
+          x: 1.960987,
+          y: 1.548584
         },
         {
-          x: 0.920111,
-          y: 2.335567
+          x: 1.344093,
+          y: 2.165478
         },
         {
-          x: 0.034666,
-          y: 2.335566
+          x: 0.165478,
+          y: 2.165478
         },
         {
-          x: -0.703066,
-          y: 1.597834
+          x: -0.428066,
+          y: 1.571934
         },
         {
-          x: -0.703066,
-          y: 1.2
+          x: -0.428066,
+          y: 1.185303
         }
       ]
     },
@@ -3915,32 +3915,64 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: -0.8,
-          y: -1.893395
+          x: -0.695585,
+          y: -1.475
+        },
+        {
+          x: -0.810394,
+          y: -1.360191
+        },
+        {
+          x: -1.493877,
+          y: -1.360191
+        },
+        {
+          x: -1.80445,
+          y: -1.049618
+        },
+        {
+          x: -1.80445,
+          y: 0.214427
+        },
+        {
+          x: -1.801,
+          y: 0.210977
+        },
+        {
+          x: -1.801,
+          y: 0.217877
+        },
+        {
+          x: -1.492877,
+          y: 0.526
         },
         {
-          x: -1.706605,
-          y: -1.893395
+          x: -1.057123,
+          y: 0.526
         },
         {
-          x: -2.10103,
-          y: -1.49897
+          x: -0.849428,
+          y: 0.318305
         },
         {
-          x: -2.10103,
-          y: 1.002011
+          x: -0.5,
+          y: 0.667733
         },
         {
-          x: -1.708294,
-          y: 1.394747
+          x: -0.5,
+          y: 0.678735
         },
         {
-          x: -0.897813,
-          y: 1.394747
+          x: -0.479066,
+          y: 0.699669
         },
         {
-          x: -0.703066,
-          y: 1.2
+          x: -0.479066,
+          y: 1.134303
+        },
+        {
+          x: -0.428066,
+          y: 1.185303
         }
       ]
     },
@@ -3951,16 +3983,16 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: 1.268717,
-          y: -1.698536
+          x: 0.981466,
+          y: -1.472559
         },
         {
-          x: 0.369558,
-          y: -0.799377
+          x: 0.343098,
+          y: -0.834191
         },
         {
-          x: -1.115754,
-          y: -0.799377
+          x: -1.276,
+          y: -0.834191
         }
       ]
     },
@@ -3971,8 +4003,20 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: -1.115754,
-          y: -0.799377
+          x: -1.276,
+          y: -0.834191
+        },
+        {
+          x: -1.156476,
+          y: -0.834191
+        },
+        {
+          x: -0.809571,
+          y: -0.487286
+        },
+        {
+          x: -0.803663,
+          y: -0.487286
         },
         {
           x: 0.397934,
@@ -3980,7 +4024,11 @@ var via_tile_default = {
         },
         {
           x: 0.397934,
-          y: 1.458567
+          y: 1.051387
+        },
+        {
+          x: 0.685025,
+          y: 1.338478
         }
       ]
     },
@@ -3991,24 +4039,20 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: 1.186721,
-          y: 1.32508
-        },
-        {
-          x: 0.907834,
-          y: 1.046193
+          x: 1.434987,
+          y: 1.330707
         },
         {
-          x: 0.907834,
-          y: -0.261774
+          x: 0.957834,
+          y: 0.853554
         },
         {
-          x: 1.644258,
-          y: -0.998198
+          x: 0.957834,
+          y: -0.390253
         },
         {
-          x: 1.655408,
-          y: -0.998198
+          x: 1.478363,
+          y: -0.910782
         }
       ]
     },
@@ -4019,31 +4063,31 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: 1.186721,
-          y: 1.32508
+          x: 1.434987,
+          y: 1.330707
         },
         {
-          x: 1.186721,
-          y: 1.484368
+          x: 1.434987,
+          y: 1.332393
         },
         {
-          x: 0.636522,
-          y: 2.034567
+          x: 0.902902,
+          y: 1.864478
         },
         {
-          x: 0.159346,
-          y: 2.034567
+          x: 0.467148,
+          y: 1.864478
         },
         {
-          x: -0.178066,
-          y: 1.697155
+          x: 0.096934,
+          y: 1.494264
         },
         {
-          x: -0.178066,
-          y: 0.981123
+          x: 0.096934,
+          y: 0.838989
         },
         {
-          x: -1.159189,
+          x: -0.742055,
           y: 0
         },
         {
@@ -4063,28 +4107,24 @@ var via_tile_default = {
           y: -0.164505
         },
         {
-          x: 1.565592,
-          y: -0.164505
-        },
-        {
-          x: 2.181408,
-          y: -0.780321
+          x: 2.004363,
+          y: -0.615839
         },
         {
-          x: 2.181408,
-          y: -1.600433
+          x: 2.004363,
+          y: -1.193539
         },
         {
-          x: 1.507305,
-          y: -2.274536
+          x: 1.197902,
+          y: -2
         },
         {
-          x: 0.630282,
-          y: -2.274536
+          x: 0.607488,
+          y: -2
         },
         {
-          x: 0.222457,
-          y: -1.866711
+          x: 0.251271,
+          y: -1.643783
         }
       ]
     },
@@ -4095,56 +4135,32 @@ var via_tile_default = {
       layer: "bottom",
       segments: [
         {
-          x: 0.222457,
-          y: -1.866711
-        },
-        {
-          x: 0.137528,
-          y: -1.866711
-        },
-        {
-          x: -0.329183,
-          y: -1.4
-        },
-        {
-          x: -0.361788,
-          y: -1.367395
+          x: 0.251271,
+          y: -1.643783
         },
         {
-          x: -1.017877,
-          y: -1.367395
+          x: -0.105946,
+          y: -2.001
         },
         {
-          x: -1.237643,
-          y: -1.587161
+          x: -1.278746,
+          y: -2.001
         },
         {
-          x: -1.587161,
-          y: -1.587161
+          x: -2.10545,
+          y: -1.174296
         },
         {
-          x: -1.8,
-          y: -1.374322
+          x: -2.10545,
+          y: 0.339105
         },
         {
-          x: -1.8,
-          y: -1.036995
+          x: -1.377121,
+          y: 1.067434
         },
         {
-          x: -1.80003,
-          y: -1.036965
-        },
-        {
-          x: -1.80003,
-          y: -0.6
-        },
-        {
-          x: -1.80003,
-          y: 0.488423
-        },
-        {
-          x: -1.419706,
-          y: 0.868747
+          x: -1.168748,
+          y: 1.067434
         }
       ]
     }
@@ -14798,7 +14814,8 @@ function createPortsAlongEdge(edge, portPitch = 0.4) {
 
 // lib/ViaGraphSolver/via-graph-generator/generateConvexViaTopologyRegions.ts
 var DEFAULT_PORT_PITCH2 = 0.4;
-var DEFAULT_TILE_SIZE2 = 5;
+var DEFAULT_TILE_WIDTH = 4.417;
+var DEFAULT_TILE_HEIGHT = 4.494;
 var DEFAULT_CLEARANCE = 0.1;
 function deduplicateConsecutivePoints(points, tolerance = 1e-3) {
   if (points.length <= 1) return points;
@@ -14955,7 +14972,8 @@ function translateRouteSegments2(routeSegments, dx, dy, prefix) {
   }));
 }
 function generateConvexViaTopologyRegions(opts) {
-  const tileSize = opts.tileSize ?? DEFAULT_TILE_SIZE2;
+  const tileWidth = opts.tileWidth ?? opts.tileSize ?? DEFAULT_TILE_WIDTH;
+  const tileHeight = opts.tileHeight ?? opts.tileSize ?? DEFAULT_TILE_HEIGHT;
   const portPitch = opts.portPitch ?? DEFAULT_PORT_PITCH2;
   const clearance = opts.clearance ?? DEFAULT_CLEARANCE;
   const concavityTolerance = opts.concavityTolerance ?? 0;
@@ -14963,22 +14981,23 @@ function generateConvexViaTopologyRegions(opts) {
   const { viasByNet, routeSegments } = inputViaTile;
   const width = bounds.maxX - bounds.minX;
   const height = bounds.maxY - bounds.minY;
-  const cols = Math.floor(width / tileSize);
-  const rows = Math.floor(height / tileSize);
+  const cols = Math.floor(width / tileWidth);
+  const rows = Math.floor(height / tileHeight);
   const allRegions = [];
   const allPorts = [];
   const viaTile = { viasByNet: {}, routeSegments: [] };
   const viaRegions = [];
-  const gridWidth = cols * tileSize;
-  const gridHeight = rows * tileSize;
+  const gridWidth = cols * tileWidth;
+  const gridHeight = rows * tileHeight;
   const gridMinX = bounds.minX + (width - gridWidth) / 2;
   const gridMinY = bounds.minY + (height - gridHeight) / 2;
-  const half = tileSize / 2;
+  const halfWidth = tileWidth / 2;
+  const halfHeight = tileHeight / 2;
   if (rows > 0 && cols > 0) {
     for (let row = 0; row < rows; row++) {
       for (let col = 0; col < cols; col++) {
-        const tileCenterX = gridMinX + col * tileSize + half;
-        const tileCenterY = gridMinY + row * tileSize + half;
+        const tileCenterX = gridMinX + col * tileWidth + halfWidth;
+        const tileCenterY = gridMinY + row * tileHeight + halfHeight;
         const prefix = `t${row}_${col}`;
         for (const [netName, vias] of Object.entries(viasByNet)) {
           if (vias.length === 0) continue;
@@ -15156,6 +15175,8 @@ function createConvexViaGraphFromXYConnections(xyConnections, viaTile = via_tile
   } = generateConvexViaTopologyRegions({
     viaTile,
     bounds,
+    tileWidth: opts?.tileWidth,
+    tileHeight: opts?.tileHeight,
     tileSize: opts?.tileSize,
     portPitch: opts?.portPitch,
     clearance: opts?.clearance,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/hypergraph",
   "main": "dist/index.js",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "type": "module",
   "scripts": {
     "start": "cosmos",