@tscircuit/hypergraph 0.0.3 → 0.0.5

package/dist/index.d.ts

@@ -115,9 +115,17 @@ interface JPort extends RegionPort {
 type JumperGraph = {
     regions: JRegion[];
     ports: JPort[];
+    jumperLocations?: Array<{
+        center: {
+            x: number;
+            y: number;
+        };
+        orientation: "vertical" | "horizontal";
+        padRegions: JRegion[];
+    }>;
 };
 
-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 +142,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

@@ -173,9 +173,29 @@ var applyTransformToGraph = (graph, matrix) => {
     newRegion2.ports.push(newPort);
     return newPort;
   });
+  const transformedJumperLocations = graph.jumperLocations?.map((loc) => {
+    const newCenter = applyToPoint(matrix, loc.center);
+    const newPadRegions = loc.padRegions.map(
+      (region) => regionMap.get(region)
+    );
+    const unitX = applyToPoint(matrix, { x: 1, y: 0 });
+    const origin = applyToPoint(matrix, { x: 0, y: 0 });
+    const dx = unitX.x - origin.x;
+    const dy = unitX.y - origin.y;
+    const isRotated90 = Math.abs(dy) > Math.abs(dx);
+    const newOrientation = isRotated90 ? loc.orientation === "horizontal" ? "vertical" : "horizontal" : loc.orientation;
+    return {
+      center: newCenter,
+      orientation: newOrientation,
+      padRegions: newPadRegions
+    };
+  });
   return {
     regions: transformedRegions,
-    ports: transformedPorts
+    ports: transformedPorts,
+    ...transformedJumperLocations && {
+      jumperLocations: transformedJumperLocations
+    }
   };
 };
 var rotateGraph90Degrees = (graph) => {
@@ -199,15 +219,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 +245,24 @@ 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 = orientation2 === "horizontal" ? bounds.maxY - bounds.minY : bounds.maxX - bounds.minX;
+    const boundsHeight = orientation2 === "horizontal" ? bounds.maxX - bounds.minX : 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 collectedJumperLocations = [];
+  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;
@@ -433,6 +465,13 @@ var generateJumperX4Grid = ({
         throughjumper3,
         throughjumper4
       );
+      const jumperCenterX = (p1CenterX + p8CenterX) / 2;
+      const jumperCenterY = (p1CenterY + p4CenterY) / 2;
+      collectedJumperLocations.push({
+        center: { x: jumperCenterX, y: jumperCenterY },
+        orientation: "vertical",
+        padRegions: [pad1, pad2, pad3, pad4, pad5, pad6, pad7, pad8]
+      });
       let leftBP12 = null;
       let leftBP23 = null;
       let leftBP34 = null;
@@ -837,7 +876,7 @@ var generateJumperX4Grid = ({
               `cell_${row}_${col - 1}->cell_${row}_${col}:T-T`,
               prevCell.top,
               top,
-              innerRowChannelPointCount
+              effectiveOuterChannelYPoints
             )
           );
         }
@@ -847,7 +886,7 @@ var generateJumperX4Grid = ({
               `cell_${row}_${col - 1}->cell_${row}_${col}:B-B`,
               prevCell.bottom,
               bottom,
-              innerRowChannelPointCount
+              isLastRow ? effectiveOuterChannelYPoints : innerRowChannelPointCount
             )
           );
         }
@@ -914,19 +953,31 @@ var generateJumperX4Grid = ({
       }
     }
   }
-  let graph = { regions, ports };
+  let graph = {
+    regions,
+    ports,
+    jumperLocations: collectedJumperLocations
+  };
   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 = [];
-    matrices.push(translate(-currentCenter.x, -currentCenter.y));
+    let targetCenter;
+    if (center) {
+      targetCenter = center;
+    } else if (bounds) {
+      targetCenter = computeBoundsCenter(bounds);
+    } else {
+      targetCenter = currentCenter;
+    }
+    matrices.push(translate(targetCenter.x, targetCenter.y));
     if (needsRotation) {
       matrices.push(rotate(-Math.PI / 2));
     }
-    const targetCenter = center ?? currentCenter;
-    matrices.push(translate(targetCenter.x, targetCenter.y));
+    matrices.push(translate(-currentCenter.x, -currentCenter.y));
     const matrix = compose(...matrices);
     graph = applyTransformToGraph(graph, matrix);
   }

package/package.json

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