@tscircuit/core 0.0.1245 → 0.0.1247

package/dist/index.d.ts

@@ -78,6 +78,7 @@ type SimplifiedPcbTrace = Omit<SimplifiedPcbTrace$1, "connection_name" | "route"
 };
 type Obstacle = {
     obstacleId?: string;
+    componentId?: string;
     type: "rect";
     layers: string[];
     zLayers?: number[];

package/dist/index.js

@@ -2729,15 +2729,17 @@ var getAxisAlignedRectFromRotatedRect = (rotatedRect) => {
   }
   return null;
 };
-var getObstaclesFromCircuitJson = (soup, connMap) => {
+var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
   const withNetId = (idList) => connMap ? idList.concat(
     idList.map((id) => connMap?.getNetConnectedToId(id)).filter(Boolean)
   ) : idList;
   const obstacles = [];
-  for (const element of soup) {
+  for (const element of circuitJson) {
+    const pcbComponentId = element.pcb_component_id ?? void 0;
     if (element.type === "pcb_smtpad") {
       if (element.shape === "circle") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
           layers: [element.layer],
@@ -2751,6 +2753,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "rect") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: [element.layer],
           center: {
@@ -2771,6 +2774,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         const axisAlignedRect = getAxisAlignedRectFromRotatedRect(rotatedRect);
         const rect = axisAlignedRect ?? rotatedRect;
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: [element.layer],
           center: rect.center,
@@ -2781,6 +2785,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "pill" || element.shape === "rotated_pill") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: [element.layer],
           center: {
@@ -2800,6 +2805,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         const minY = Math.min(...ys);
         const maxY = Math.max(...ys);
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: [element.layer],
           center: {
@@ -2814,6 +2820,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
     } else if (element.type === "pcb_keepout") {
       if (element.shape === "circle") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
           layers: element.layers,
@@ -2827,6 +2834,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "rect") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: element.layers,
           center: {
@@ -2841,6 +2849,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
     } else if (element.type === "pcb_cutout") {
       if (element.shape === "rect") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -2861,6 +2870,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         );
         for (const rect of approximatingRects) {
           obstacles.push({
+            componentId: pcbComponentId,
             type: "rect",
             layers: EVERY_LAYER,
             center: rect.center,
@@ -2875,6 +2885,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
         for (const rect of approximatingRects) {
           obstacles.push({
+            componentId: pcbComponentId,
             type: "rect",
             layers: EVERY_LAYER,
             center: rect.center,
@@ -2887,6 +2898,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
     } else if (element.type === "pcb_hole") {
       if (element.hole_shape === "oval") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
           center: {
@@ -2899,6 +2911,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.hole_shape === "pill" || element.hole_shape === "rotated_pill") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -2912,6 +2925,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.hole_shape === "rect") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -2924,6 +2938,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.hole_shape === "square") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -2939,6 +2954,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         element.hole_shape === "round" || element.hole_shape === "circle"
       ) {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -2953,6 +2969,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
     } else if (element.type === "pcb_plated_hole") {
       if (element.shape === "circle") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
           layers: EVERY_LAYER,
@@ -2966,6 +2983,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "circular_hole_with_rect_pad") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "rect",
           layers: EVERY_LAYER,
@@ -2979,6 +2997,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "oval") {
         obstacles.push({
+          componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
           layers: EVERY_LAYER,
@@ -2992,6 +3011,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         });
       } else if (element.shape === "pill") {
         obstacles.push({
+          componentId: pcbComponentId,
           type: "rect",
           layers: EVERY_LAYER,
           center: {
@@ -3014,6 +3034,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           const centerX = (minX + maxX) / 2;
           const centerY = (minY + maxY) / 2;
           obstacles.push({
+            componentId: pcbComponentId,
             // @ts-ignore
             type: "rect",
             layers: EVERY_LAYER,
@@ -3054,12 +3075,18 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
         }),
         element.source_trace_id
       );
-      obstacles.push(...traceObstacles);
+      obstacles.push(
+        ...traceObstacles.map((obstacle) => ({
+          ...obstacle,
+          componentId: pcbComponentId
+        }))
+      );
     } else if (element.type === "pcb_via") {
       const netIsAssignable = Boolean(
         element.net_is_assignable ?? element.netIsAssignable
       );
       obstacles.push({
+        componentId: pcbComponentId,
         type: "rect",
         layers: element.layers,
         center: {
@@ -19175,9 +19202,13 @@ function getExistingPcbTracesForReroute(group) {
 function addPossibleReplacementSourceTraceId(sourceTraceIds, value) {
   if (typeof value !== "string" || value.length === 0) return;
   sourceTraceIds.add(value);
-  const rerouteSuffixIndex = value.indexOf("_reroute_");
-  if (rerouteSuffixIndex > 0) {
-    sourceTraceIds.add(value.slice(0, rerouteSuffixIndex));
+  for (const connectionNamePart of value.split("__")) {
+    if (connectionNamePart.length === 0) continue;
+    sourceTraceIds.add(connectionNamePart);
+    const rerouteSuffixIndex = connectionNamePart.indexOf("_reroute_");
+    if (rerouteSuffixIndex > 0) {
+      sourceTraceIds.add(connectionNamePart.slice(0, rerouteSuffixIndex));
+    }
   }
 }
 function deleteExistingPcbTracesReplacedBy({
@@ -21216,7 +21247,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1244",
+  version: "0.0.1246",
   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.1245",
+  "version": "0.0.1247",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",