@tscircuit/hypergraph 0.0.3 → 0.0.4

package/dist/index.d.ts

@@ -117,7 +117,7 @@ type JumperGraph = {
     ports: JPort[];
 };
 
-declare const generateJumperX4Grid: ({ cols, rows, marginX, marginY, innerColChannelPointCount, innerRowChannelPointCount, regionsBetweenPads, outerPaddingX, outerPaddingY, outerChannelXPointCount, outerChannelYPointCount, orientation, center, }: {
+declare const generateJumperX4Grid: ({ cols, rows, marginX, marginY, innerColChannelPointCount, innerRowChannelPointCount, regionsBetweenPads, outerPaddingX: outerPaddingXParam, outerPaddingY: outerPaddingYParam, outerChannelXPointCount, outerChannelYPointCount, orientation, center, bounds, }: {
     cols: number;
     rows: number;
     marginX: number;
@@ -134,6 +134,12 @@ declare const generateJumperX4Grid: ({ cols, rows, marginX, marginY, innerColCha
         x: number;
         y: number;
     };
+    bounds?: {
+        minX: number;
+        maxX: number;
+        minY: number;
+        maxY: number;
+    };
 }) => JumperGraph;
 
 declare const generateJumperGrid: ({ cols, rows, marginX, marginY, innerColChannelPointCount, innerRowChannelPointCount, outerPaddingX, outerPaddingY, outerChannelXPoints, outerChannelYPoints, }: {

package/dist/index.js

@@ -199,15 +199,14 @@ var generateJumperX4Grid = ({
   innerColChannelPointCount = 1,
   innerRowChannelPointCount = 1,
   regionsBetweenPads = false,
-  outerPaddingX = 0.5,
-  outerPaddingY = 0.5,
+  outerPaddingX: outerPaddingXParam = 0.5,
+  outerPaddingY: outerPaddingYParam = 0.5,
   outerChannelXPointCount,
   outerChannelYPointCount,
   orientation: orientation2 = "vertical",
-  center
+  center,
+  bounds
 }) => {
-  const effectiveOuterChannelXPoints = outerChannelXPointCount ?? Math.max(1, Math.floor(outerPaddingX / 0.4));
-  const effectiveOuterChannelYPoints = outerChannelYPointCount ?? Math.max(1, Math.floor(outerPaddingY / 0.4));
   const regions = [];
   const ports = [];
   const {
@@ -226,11 +225,23 @@ var generateJumperX4Grid = ({
   const horizontalSpacing = cellWidth + marginX;
   const cellHeight = row1CenterY - row4CenterY + padHeight;
   const verticalSpacing = cellHeight + marginY;
+  let outerPaddingX = outerPaddingXParam;
+  let outerPaddingY = outerPaddingYParam;
+  if (bounds) {
+    const contentWidth = cols * cellWidth + (cols - 1) * marginX;
+    const contentHeight = rows * cellHeight + (rows - 1) * marginY;
+    const boundsWidth = bounds.maxX - bounds.minX;
+    const boundsHeight = bounds.maxY - bounds.minY;
+    outerPaddingX = (boundsWidth - contentWidth) / 2;
+    outerPaddingY = (boundsHeight - contentHeight) / 2;
+  }
+  const effectiveOuterChannelXPoints = outerChannelXPointCount ?? Math.max(1, Math.floor(outerPaddingX / 0.4));
+  const effectiveOuterChannelYPoints = outerChannelYPointCount ?? Math.max(1, Math.floor(outerPaddingY / 0.4));
   const cells = [];
-  const createRegion = (id, bounds, isPad, isThroughJumper) => ({
+  const createRegion = (id, bounds2, isPad, isThroughJumper) => ({
     regionId: id,
     ports: [],
-    d: { bounds, center: computeBoundsCenter(bounds), isPad, isThroughJumper }
+    d: { bounds: bounds2, center: computeBoundsCenter(bounds2), isPad, isThroughJumper }
   });
   const createPort = (id, region1, region2) => {
     const b1 = region1.d.bounds;
@@ -837,7 +848,7 @@ var generateJumperX4Grid = ({
               `cell_${row}_${col - 1}->cell_${row}_${col}:T-T`,
               prevCell.top,
               top,
-              innerRowChannelPointCount
+              effectiveOuterChannelYPoints
             )
           );
         }
@@ -847,7 +858,7 @@ var generateJumperX4Grid = ({
               `cell_${row}_${col - 1}->cell_${row}_${col}:B-B`,
               prevCell.bottom,
               bottom,
-              innerRowChannelPointCount
+              isLastRow ? effectiveOuterChannelYPoints : innerRowChannelPointCount
             )
           );
         }
@@ -917,7 +928,8 @@ var generateJumperX4Grid = ({
   let graph = { regions, ports };
   const needsRotation = orientation2 === "horizontal";
   const needsCentering = center !== void 0;
-  if (needsRotation || needsCentering) {
+  const needsBoundsTransform = bounds !== void 0;
+  if (needsRotation || needsCentering || needsBoundsTransform) {
     const currentBounds = calculateGraphBounds(graph.regions);
     const currentCenter = computeBoundsCenter(currentBounds);
     const matrices = [];
@@ -925,7 +937,14 @@ var generateJumperX4Grid = ({
     if (needsRotation) {
       matrices.push(rotate(-Math.PI / 2));
     }
-    const targetCenter = center ?? currentCenter;
+    let targetCenter;
+    if (center) {
+      targetCenter = center;
+    } else if (bounds) {
+      targetCenter = computeBoundsCenter(bounds);
+    } else {
+      targetCenter = currentCenter;
+    }
     matrices.push(translate(targetCenter.x, targetCenter.y));
     const matrix = compose(...matrices);
     graph = applyTransformToGraph(graph, matrix);

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@tscircuit/hypergraph",
   "main": "dist/index.js",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "scripts": {
     "start": "cosmos",
+    "format": "biome format --write .",
     "build:site": "cosmos-export",
     "build": "tsup ./lib/index.ts --dts --format esm"
   },