@tscircuit/core 0.0.522 → 0.0.524

package/dist/index.d.ts

@@ -7407,7 +7407,9 @@ declare class NetLabel extends PrimitiveComponent<typeof netLabelProps> {
             anchorSide?: "left" | "right" | "top" | "bottom" | undefined;
         }>;
     };
-    doInitialSchematicComponentRender(): void;
+    _getAnchorSide(): "top" | "bottom" | "left" | "right";
+    _getConnectedPorts(): Port[];
+    doInitialSchematicPrimitiveRender(): void;
     _resolveConnectsTo(): string[] | undefined;
     _getNetName(): string;
     doInitialCreateNetsFromProps(): void;

package/dist/index.js

@@ -4419,6 +4419,71 @@ function generateApproximatingRects(rotatedRect, numRects = 4) {
   return rects;
 }
 
+// lib/utils/obstacles/fillPolygonWithRects.ts
+function fillPolygonWithRects(polygon, options = {}) {
+  if (polygon.length < 3) return [];
+  const { rectHeight = 0.1 } = options;
+  const rects = [];
+  const yCoords = polygon.map((p) => p.y);
+  const minY = Math.min(...yCoords);
+  const maxY = Math.max(...yCoords);
+  for (let y = minY; y < maxY; y += rectHeight) {
+    const scanlineY = y + rectHeight / 2;
+    const intersections = [];
+    for (let i = 0; i < polygon.length; i++) {
+      const p1 = polygon[i];
+      const p2 = polygon[(i + 1) % polygon.length];
+      if (p1.y <= scanlineY && p2.y > scanlineY || p2.y <= scanlineY && p1.y > scanlineY) {
+        const x = (scanlineY - p1.y) * (p2.x - p1.x) / (p2.y - p1.y) + p1.x;
+        intersections.push(x);
+      }
+    }
+    intersections.sort((a, b) => a - b);
+    for (let i = 0; i < intersections.length; i += 2) {
+      if (i + 1 < intersections.length) {
+        const x1 = intersections[i];
+        const x2 = intersections[i + 1];
+        const width = x2 - x1;
+        if (width > 1e-6) {
+          rects.push({
+            center: {
+              x: x1 + width / 2,
+              y: scanlineY
+            },
+            width,
+            height: rectHeight
+          });
+        }
+      }
+    }
+  }
+  return rects;
+}
+
+// lib/utils/obstacles/fillCircleWithRects.ts
+function fillCircleWithRects(circle, options = {}) {
+  const { center, radius } = circle;
+  const { rectHeight = 0.1 } = options;
+  const rects = [];
+  const numSlices = Math.ceil(radius * 2 / rectHeight);
+  for (let i = 0; i < numSlices; i++) {
+    const y = center.y - radius + (i + 0.5) * rectHeight;
+    const dy = y - center.y;
+    const halfWidth = Math.sqrt(radius * radius - dy * dy);
+    if (halfWidth > 0) {
+      rects.push({
+        center: {
+          x: center.x,
+          y
+        },
+        width: halfWidth * 2,
+        height: rectHeight
+      });
+    }
+  }
+  return rects;
+}
+
 // lib/utils/obstacles/getObstaclesFromCircuitJson.ts
 var EVERY_LAYER = ["top", "inner1", "inner2", "bottom"];
 var getObstaclesFromCircuitJson = (soup, connMap) => {
@@ -4499,6 +4564,52 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           connectedTo: []
         });
       }
+    } else if (element.type === "pcb_cutout") {
+      if (element.shape === "rect") {
+        obstacles.push({
+          type: "rect",
+          layers: EVERY_LAYER,
+          center: {
+            x: element.center.x,
+            y: element.center.y
+          },
+          width: element.width,
+          height: element.height,
+          connectedTo: []
+        });
+      } else if (element.shape === "circle") {
+        const approximatingRects = fillCircleWithRects(
+          {
+            center: element.center,
+            radius: element.radius
+          },
+          { rectHeight: 0.6 }
+        );
+        for (const rect of approximatingRects) {
+          obstacles.push({
+            type: "rect",
+            layers: EVERY_LAYER,
+            center: rect.center,
+            width: rect.width,
+            height: rect.height,
+            connectedTo: []
+          });
+        }
+      } else if (element.shape === "polygon") {
+        const approximatingRects = fillPolygonWithRects(element.points, {
+          rectHeight: 0.6
+        });
+        for (const rect of approximatingRects) {
+          obstacles.push({
+            type: "rect",
+            layers: EVERY_LAYER,
+            center: rect.center,
+            width: rect.width,
+            height: rect.height,
+            connectedTo: []
+          });
+        }
+      }
     } else if (element.type === "pcb_hole") {
       if (element.hole_shape === "oval") {
         obstacles.push({
@@ -9297,18 +9408,50 @@ var NetLabel = class extends PrimitiveComponent2 {
       zodProps: netLabelProps
     };
   }
-  doInitialSchematicComponentRender() {
+  _getAnchorSide() {
+    const { _parsedProps: props } = this;
+    if (props.anchorSide) return props.anchorSide;
+    const connectsTo = this._resolveConnectsTo();
+    if (!connectsTo) return "right";
+    const anchorPos = this._getGlobalSchematicPositionBeforeLayout();
+    const connectedPorts = this._getConnectedPorts();
+    if (connectedPorts.length === 0) return "right";
+    const connectedPortPosition = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
+    const dx = connectedPortPosition.x - anchorPos.x;
+    const dy = connectedPortPosition.y - anchorPos.y;
+    if (Math.abs(dx) > Math.abs(dy)) {
+      if (dx > 0) return "right";
+      if (dx < 0) return "left";
+    } else {
+      if (dy > 0) return "top";
+      if (dy < 0) return "bottom";
+    }
+    return "right";
+  }
+  _getConnectedPorts() {
+    const connectsTo = this._resolveConnectsTo();
+    if (!connectsTo) return [];
+    const connectedPorts = [];
+    for (const connection of connectsTo) {
+      const port = this.getSubcircuit().selectOne(connection);
+      if (port) {
+        connectedPorts.push(port);
+      }
+    }
+    return connectedPorts;
+  }
+  doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const anchorPos = { x: props.schX ?? 0, y: props.schY ?? 0 };
+    const anchorPos = this._getGlobalSchematicPositionBeforeLayout();
     const netLabel = db.schematic_net_label.insert({
       text: props.net,
       source_net_id: props.net,
       anchor_position: anchorPos,
       // TODO compute the center based on the text size
       center: anchorPos,
-      anchor_side: props.anchorSide ?? "right"
+      anchor_side: this._getAnchorSide()
     });
     this.source_net_label_id = netLabel.source_net_id;
   }
@@ -10452,7 +10595,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.521",
+  version: "0.0.523",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.522",
+  "version": "0.0.524",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",