@tscircuit/core 0.0.1154 → 0.0.1156

package/dist/index.d.ts

@@ -64,6 +64,7 @@ type Obstacle = {
     obstacleId?: string;
     type: "rect";
     layers: string[];
+    zLayers?: number[];
     center: {
         x: number;
         y: number;
@@ -71,6 +72,7 @@ type Obstacle = {
     width: number;
     height: number;
     connectedTo: string[];
+    isCopperPour?: boolean;
     netIsAssignable?: boolean;
     offBoardConnectsTo?: string[];
 };
@@ -950,6 +952,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                     name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
                 } | undefined;
             }>, z.ZodString]>, "many">, "many">>;
+            routingPhaseIndex: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             pcbStraightLine: z.ZodOptional<z.ZodBoolean>;
             schDisplayLabel: z.ZodOptional<z.ZodString>;
             schStroke: z.ZodOptional<z.ZodString>;
@@ -972,6 +975,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             width?: number | undefined;
             maxLength?: number | undefined;
             connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
             schematicRouteHints?: {
                 x: number;
                 y: number;
@@ -1011,6 +1015,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             width?: string | number | undefined;
             maxLength?: string | number | undefined;
             connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
             schematicRouteHints?: {
                 x: string | number;
                 y: string | number;
@@ -1206,6 +1211,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
                     name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
                 } | undefined;
             }>, z.ZodString]>, "many">, "many">>;
+            routingPhaseIndex: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             pcbStraightLine: z.ZodOptional<z.ZodBoolean>;
             schDisplayLabel: z.ZodOptional<z.ZodString>;
             schStroke: z.ZodOptional<z.ZodString>;
@@ -1236,6 +1242,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             width?: number | undefined;
             maxLength?: number | undefined;
             connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
             schematicRouteHints?: {
                 x: number;
                 y: number;
@@ -1278,6 +1285,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             width?: string | number | undefined;
             maxLength?: string | number | undefined;
             connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
             schematicRouteHints?: {
                 x: string | number;
                 y: string | number;
@@ -82901,6 +82909,7 @@ declare class CopperPour extends PrimitiveComponent<typeof copperPourProps> {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>;
             connectsTo: zod.ZodString;
+            unbroken: zod.ZodOptional<zod.ZodBoolean>;
             padMargin: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             traceMargin: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             clearance: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
@@ -82926,6 +82935,7 @@ declare class CopperPour extends PrimitiveComponent<typeof copperPourProps> {
                 x: number;
                 y: number;
             }[] | undefined;
+            unbroken?: boolean | undefined;
             padMargin?: number | undefined;
             traceMargin?: number | undefined;
             clearance?: number | undefined;
@@ -82942,6 +82952,7 @@ declare class CopperPour extends PrimitiveComponent<typeof copperPourProps> {
                 y: string | number;
             }[] | undefined;
             coveredWithSolderMask?: boolean | undefined;
+            unbroken?: boolean | undefined;
             padMargin?: string | number | undefined;
             traceMargin?: string | number | undefined;
             clearance?: string | number | undefined;
@@ -151818,12 +151829,15 @@ declare const applyEditEvents: ({ circuitJson, editEvents, }: {
 /**
  * This function can only be called in the PcbTraceRender phase or later
  */
-declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_id, minTraceWidth, nominalTraceWidth, }: {
+declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_id, minTraceWidth, nominalTraceWidth, subcircuitComponent, }: {
     db?: CircuitJsonUtilObjects;
     circuitJson?: AnyCircuitElement[];
     subcircuit_id?: string | null;
     minTraceWidth?: number;
     nominalTraceWidth?: number;
+    subcircuitComponent?: {
+        selectAll(selector: string): unknown[];
+    };
 }) => {
     simpleRouteJson: SimpleRouteJson;
     connMap: ConnectivityMap;

package/dist/index.js

@@ -2679,6 +2679,25 @@ function fillCircleWithRects(circle, options = {}) {
 
 // lib/utils/obstacles/getObstaclesFromCircuitJson.ts
 var EVERY_LAYER = ["top", "inner1", "inner2", "bottom"];
+var QUARTER_TURN_TOLERANCE_DEGREES = 0.01;
+var getAxisAlignedRectFromRotatedRect = (rotatedRect) => {
+  const normalizedRotation = (rotatedRect.rotation % 360 + 360) % 360;
+  const axisAlignedAngles = [0, 90, 180, 270];
+  for (const angle of axisAlignedAngles) {
+    const angularDistance = Math.min(
+      Math.abs(normalizedRotation - angle),
+      360 - Math.abs(normalizedRotation - angle)
+    );
+    if (angularDistance > QUARTER_TURN_TOLERANCE_DEGREES) continue;
+    const isVertical = angle === 90 || angle === 270;
+    return {
+      center: rotatedRect.center,
+      width: isVertical ? rotatedRect.height : rotatedRect.width,
+      height: isVertical ? rotatedRect.width : rotatedRect.height
+    };
+  }
+  return null;
+};
 var getObstaclesFromCircuitJson = (soup, connMap) => {
   const withNetId = (idList) => connMap ? idList.concat(
     idList.map((id) => connMap?.getNetConnectedToId(id)).filter(Boolean)
@@ -2718,8 +2737,9 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.height,
           rotation: element.ccw_rotation
         };
-        const approximatingRects = generateApproximatingRects(rotatedRect);
-        for (const rect of approximatingRects) {
+        const singleRect = getAxisAlignedRectFromRotatedRect(rotatedRect);
+        const rects = singleRect ? [singleRect] : generateApproximatingRects(rotatedRect);
+        for (const rect of rects) {
           obstacles.push({
             type: "rect",
             layers: [element.layer],
@@ -13120,12 +13140,127 @@ import { su as su4 } from "@tscircuit/circuit-json-util";
 import {
   getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson3
 } from "circuit-json-to-connectivity-map";
+
+// lib/utils/autorouting/getUnbrokenCopperPourObstacles.ts
+var COPPER_POUR_RECT_HEIGHT = 0.5;
+var dedupeStrings = (values) => Array.from(new Set(values.filter((value) => Boolean(value))));
+var getLayerName = (layer) => typeof layer === "string" ? layer : layer.name;
+var createCopperPourObstacle = ({
+  layer,
+  connectedTo,
+  center,
+  width,
+  height
+}) => ({
+  type: "rect",
+  layers: [layer],
+  center,
+  width,
+  height,
+  connectedTo,
+  isCopperPour: true
+});
+var getCopperPourBoundary = ({
+  outline,
+  group,
+  board
+}) => {
+  if (outline && outline.length >= 3) return outline;
+  if (group?.outline && group.outline.length >= 3) return group.outline;
+  if (board?.outline && board.outline.length >= 3) return board.outline;
+  return null;
+};
+var getCopperPourBoundsRect = ({
+  group,
+  board
+}) => {
+  if (group?.width && group.height) {
+    return {
+      center: group.center,
+      width: group.width,
+      height: group.height
+    };
+  }
+  if (board?.width && board.height) {
+    return {
+      center: board.center,
+      width: board.width,
+      height: board.height
+    };
+  }
+  return null;
+};
+var getCopperPourConnectedTo = (net, connMap) => dedupeStrings([
+  net.source_net_id,
+  net.subcircuit_connectivity_map_key,
+  net.source_net_id ? connMap.getNetConnectedToId(net.source_net_id) : null
+]);
+var getUnbrokenCopperPourObstacles = ({
+  connMap,
+  subcircuitComponent,
+  board,
+  group
+}) => {
+  if (!subcircuitComponent) return [];
+  const obstacles = [];
+  const copperPours = subcircuitComponent.selectAll(
+    "copperpour"
+  );
+  for (const copperPour of copperPours) {
+    const props = copperPour._parsedProps;
+    if (!props.unbroken) continue;
+    const net = copperPour.getSubcircuit().selectOne(props.connectsTo);
+    if (!net?.source_net_id) continue;
+    const layer = getLayerName(props.layer);
+    const connectedTo = getCopperPourConnectedTo(net, connMap);
+    if (connectedTo.length === 0) continue;
+    const boundary = getCopperPourBoundary({
+      outline: props.outline,
+      group,
+      board
+    });
+    if (boundary) {
+      const rects = fillPolygonWithRects(boundary, {
+        rectHeight: COPPER_POUR_RECT_HEIGHT
+      });
+      if (rects.length > 0) {
+        obstacles.push(
+          ...rects.map(
+            (rect) => createCopperPourObstacle({
+              layer,
+              connectedTo,
+              center: rect.center,
+              width: rect.width,
+              height: rect.height
+            })
+          )
+        );
+        continue;
+      }
+    }
+    const boundsRect = getCopperPourBoundsRect({ group, board });
+    if (!boundsRect) continue;
+    obstacles.push(
+      createCopperPourObstacle({
+        layer,
+        connectedTo,
+        center: boundsRect.center,
+        width: boundsRect.width,
+        height: boundsRect.height
+      })
+    );
+  }
+  return obstacles;
+};
+
+// lib/utils/autorouting/getSimpleRouteJsonFromCircuitJson.ts
 var getSimpleRouteJsonFromCircuitJson = ({
   db,
   circuitJson,
   subcircuit_id,
   minTraceWidth = 0.1,
-  nominalTraceWidth
+  nominalTraceWidth,
+  subcircuitComponent
 }) => {
   if (!db && circuitJson) {
     db = su4(circuitJson);
@@ -13161,6 +13296,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
     board = db.pcb_board.list()[0];
   }
   db = su4(subcircuitElements);
+  const pcbGroup = subcircuit_id ? db.pcb_group.getWhere({ subcircuit_id }) : void 0;
   const connMap = getFullConnectivityMapFromCircuitJson3(subcircuitElements);
   const obstacles = getObstaclesFromCircuitJson(
     [
@@ -13177,6 +13313,14 @@ var getSimpleRouteJsonFromCircuitJson = ({
     ),
     connMap
   );
+  obstacles.push(
+    ...getUnbrokenCopperPourObstacles({
+      connMap,
+      subcircuitComponent,
+      board,
+      group: pcbGroup
+    })
+  );
   for (const obstacle of obstacles) {
     const additionalIds = obstacle.connectedTo.flatMap(
       (id) => connMap.getIdsConnectedToNet(id)
@@ -13255,22 +13399,19 @@ var getSimpleRouteJsonFromCircuitJson = ({
       maxY: Math.max(...allPoints.map((p) => p.y)) + 1
     };
   }
-  if (subcircuit_id) {
-    const group = db.pcb_group.getWhere({ subcircuit_id });
-    if (group?.width && group.height) {
-      const groupBounds = {
-        minX: group.center.x - group.width / 2,
-        maxX: group.center.x + group.width / 2,
-        minY: group.center.y - group.height / 2,
-        maxY: group.center.y + group.height / 2
-      };
-      bounds = {
-        minX: Math.min(bounds.minX, groupBounds.minX),
-        maxX: Math.max(bounds.maxX, groupBounds.maxX),
-        minY: Math.min(bounds.minY, groupBounds.minY),
-        maxY: Math.max(bounds.maxY, groupBounds.maxY)
-      };
-    }
+  if (pcbGroup?.width && pcbGroup.height) {
+    const groupBounds = {
+      minX: pcbGroup.center.x - pcbGroup.width / 2,
+      maxX: pcbGroup.center.x + pcbGroup.width / 2,
+      minY: pcbGroup.center.y - pcbGroup.height / 2,
+      maxY: pcbGroup.center.y + pcbGroup.height / 2
+    };
+    bounds = {
+      minX: Math.min(bounds.minX, groupBounds.minX),
+      maxX: Math.max(bounds.maxX, groupBounds.maxX),
+      minY: Math.min(bounds.minY, groupBounds.minY),
+      maxY: Math.max(bounds.maxY, groupBounds.maxY)
+    };
   }
   const routedTraceIds = new Set(
     db.pcb_trace.list().map((t) => t.source_trace_id).filter((id) => Boolean(id))
@@ -17760,7 +17901,8 @@ var Group6 = class extends NormalComponent3 {
                 db,
                 minTraceWidth: this.props.autorouter?.minTraceWidth ?? 0.15,
                 nominalTraceWidth: this.props.nominalTraceWidth,
-                subcircuit_id: this.subcircuit_id
+                subcircuit_id: this.subcircuit_id,
+                subcircuitComponent: this
               }).simpleRouteJson,
               subcircuit_id: this.subcircuit_id
             }),
@@ -17865,7 +18007,8 @@ var Group6 = class extends NormalComponent3 {
       db,
       minTraceWidth: this.props.autorouter?.minTraceWidth ?? 0.15,
       nominalTraceWidth: this.props.nominalTraceWidth,
-      subcircuit_id: this.subcircuit_id
+      subcircuit_id: this.subcircuit_id,
+      subcircuitComponent: this
     });
     if (isAutoJumperPreset) {
       simpleRouteJson.allowJumpers = true;
@@ -19153,7 +19296,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1153",
+  version: "0.0.1155",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19185,7 +19328,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
-    "@tscircuit/capacity-autorouter": "^0.0.414",
+    "@tscircuit/capacity-autorouter": "^0.0.425",
     "@tscircuit/checks": "0.0.116",
     "@tscircuit/circuit-json-util": "^0.0.92",
     "@tscircuit/common": "^0.0.20",
@@ -19198,7 +19341,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.502",
+    "@tscircuit/props": "^0.0.504",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1154",
+  "version": "0.0.1156",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,7 +33,7 @@
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
-    "@tscircuit/capacity-autorouter": "^0.0.414",
+    "@tscircuit/capacity-autorouter": "^0.0.425",
     "@tscircuit/checks": "0.0.116",
     "@tscircuit/circuit-json-util": "^0.0.92",
     "@tscircuit/common": "^0.0.20",
@@ -46,7 +46,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.502",
+    "@tscircuit/props": "^0.0.504",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",