@tscircuit/core 0.0.908 → 0.0.909

package/dist/index.js

@@ -11836,9 +11836,7 @@ import {
   convertPackOutputToPackInput,
   getGraphicsFromPackOutput
 } from "calculate-packing";
-import {
-  length as length4
-} from "circuit-json";
+import { length as length4 } from "circuit-json";
 import Debug8 from "debug";
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/applyComponentConstraintClusters.ts
@@ -12211,83 +12209,6 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
   }
 };
 
-// lib/utils/packing/getObstacleDimensionsFromElement.ts
-function getObstacleDimensionsFromSmtPad(pad) {
-  switch (pad.shape) {
-    case "rect":
-    case "rotated_rect":
-    case "pill":
-    case "rotated_pill":
-      return {
-        width: pad.width,
-        height: pad.height
-      };
-    case "circle":
-      return {
-        width: pad.radius * 2,
-        height: pad.radius * 2
-      };
-    case "polygon":
-      if (!pad.points || pad.points.length === 0) {
-        return null;
-      }
-      const xs = pad.points.map((p) => p.x);
-      const ys = pad.points.map((p) => p.y);
-      const minX = Math.min(...xs);
-      const maxX = Math.max(...xs);
-      const minY = Math.min(...ys);
-      const maxY = Math.max(...ys);
-      return {
-        width: maxX - minX,
-        height: maxY - minY
-      };
-    default:
-      return null;
-  }
-}
-function getObstacleDimensionsFromPlatedHole(hole) {
-  switch (hole.shape) {
-    case "circular_hole_with_rect_pad":
-    case "pill_hole_with_rect_pad":
-    case "rotated_pill_hole_with_rect_pad":
-      return {
-        width: hole.rect_pad_width,
-        height: hole.rect_pad_height
-      };
-    case "circle":
-      return {
-        width: hole.outer_diameter,
-        height: hole.outer_diameter
-      };
-    case "oval":
-      return {
-        width: hole.outer_width,
-        height: hole.outer_height
-      };
-    case "pill":
-      return {
-        width: hole.outer_width,
-        height: hole.outer_height
-      };
-    case "hole_with_polygon_pad":
-      if (!("pad_outline" in hole) || !hole.pad_outline || hole.pad_outline.length === 0) {
-        return null;
-      }
-      const xs = hole.pad_outline.map((p) => p.x);
-      const ys = hole.pad_outline.map((p) => p.y);
-      const minX = Math.min(...xs);
-      const maxX = Math.max(...xs);
-      const minY = Math.min(...ys);
-      const maxY = Math.max(...ys);
-      return {
-        width: maxX - minX,
-        height: maxY - minY
-      };
-    default:
-      return null;
-  }
-}
-
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/Group_doInitialPcbLayoutPack.ts
 var DEFAULT_MIN_GAP = "1mm";
 var debug6 = Debug8("Group_doInitialPcbLayoutPack");
@@ -12304,7 +12225,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
   const gap = pcbPackGap ?? pcbGap ?? gapProp;
   const gapMm = length4.parse(gap ?? DEFAULT_MIN_GAP);
   const chipMarginsMap = {};
-  const excludedPcbComponentIds = /* @__PURE__ */ new Set();
+  const staticPcbComponentIds = /* @__PURE__ */ new Set();
   const collectMargins = (comp) => {
     if (comp?.pcb_component_id && comp?._parsedProps) {
       const props2 = comp._parsedProps;
@@ -12326,7 +12247,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
     const childIsGroupOrNormalComponent = child;
     if (childIsGroupOrNormalComponent._isNormalComponent && childIsGroupOrNormalComponent.isRelativelyPositioned?.()) {
       if (childIsGroupOrNormalComponent.pcb_component_id) {
-        excludedPcbComponentIds.add(
+        staticPcbComponentIds.add(
           childIsGroupOrNormalComponent.pcb_component_id
         );
       }
@@ -12337,67 +12258,27 @@ var Group_doInitialPcbLayoutPack = (group) => {
       }
     }
   }
-  const filteredCircuitJson = db.toArray().filter((element) => {
-    if (element.type === "pcb_component") {
-      return !excludedPcbComponentIds.has(element.pcb_component_id);
-    }
-    if (element.type === "pcb_group") {
-      return !excludedPcbGroupIds.has(element.pcb_group_id);
-    }
-    return true;
-  });
-  const obstaclesFromRelativelyPositionedComponents = [];
-  for (const pcb_component_id of excludedPcbComponentIds) {
-    const component = db.toArray().find(
-      (el) => el.type === "pcb_component" && el.pcb_component_id === pcb_component_id
-    );
-    if (!component) continue;
-    const componentX = component.center.x;
-    const componentY = component.center.y;
-    const smtpads = db.toArray().filter(
-      (el) => el.type === "pcb_smtpad" && el.pcb_component_id === pcb_component_id
-    );
-    for (const pad of smtpads) {
-      const dimensions = getObstacleDimensionsFromSmtPad(pad);
-      if (!dimensions || dimensions.width === 0 || dimensions.height === 0) {
-        continue;
-      }
-      let centerX;
-      let centerY;
-      if (pad.shape === "polygon") {
-        const xs = pad.points.map((p) => p.x);
-        const ys = pad.points.map((p) => p.y);
-        centerX = componentX + (Math.min(...xs) + Math.max(...xs)) / 2;
-        centerY = componentY + (Math.min(...ys) + Math.max(...ys)) / 2;
-      } else {
-        centerX = componentX + pad.x;
-        centerY = componentY + pad.y;
-      }
-      obstaclesFromRelativelyPositionedComponents.push({
-        obstacleId: pad.pcb_smtpad_id,
-        absoluteCenter: { x: centerX, y: centerY },
-        width: dimensions.width,
-        height: dimensions.height
-      });
-    }
-    const platedHoles = db.toArray().filter(
-      (el) => el.type === "pcb_plated_hole" && el.pcb_component_id === pcb_component_id
-    );
-    for (const hole of platedHoles) {
-      const dimensions = getObstacleDimensionsFromPlatedHole(hole);
-      if (!dimensions || dimensions.width === 0 || dimensions.height === 0) {
-        continue;
+  const isDescendantGroup2 = (db2, groupId, ancestorId) => {
+    if (groupId === ancestorId) return true;
+    const group2 = db2.source_group.get(groupId);
+    if (!group2 || !group2.parent_source_group_id) return false;
+    return isDescendantGroup2(db2, group2.parent_source_group_id, ancestorId);
+  };
+  if (excludedPcbGroupIds.size > 0) {
+    for (const element of db.toArray()) {
+      if (element.type !== "pcb_component") continue;
+      const sourceComponent = db.source_component.get(
+        element.source_component_id
+      );
+      if (!sourceComponent?.source_group_id) continue;
+      for (const groupId of excludedPcbGroupIds) {
+        if (isDescendantGroup2(db, sourceComponent.source_group_id, groupId)) {
+          staticPcbComponentIds.add(element.pcb_component_id);
+        }
       }
-      const centerX = componentX + hole.x;
-      const centerY = componentY + hole.y;
-      obstaclesFromRelativelyPositionedComponents.push({
-        obstacleId: hole.pcb_plated_hole_id,
-        absoluteCenter: { x: centerX, y: centerY },
-        width: dimensions.width,
-        height: dimensions.height
-      });
     }
   }
+  const filteredCircuitJson = db.toArray();
   let bounds;
   if (props.width !== void 0 && props.height !== void 0) {
     const widthMm = length4.parse(props.width);
@@ -12413,15 +12294,15 @@ var Group_doInitialPcbLayoutPack = (group) => {
     ...convertPackOutputToPackInput(
       convertCircuitJsonToPackOutput(filteredCircuitJson, {
         source_group_id: group.source_group_id,
-        shouldAddInnerObstacles: true,
-        chipMarginsMap
+        // shouldAddInnerObstacles: true,
+        chipMarginsMap,
+        staticPcbComponentIds: Array.from(staticPcbComponentIds)
       })
     ),
     // @ts-expect-error we're missing some pack order strategies
     orderStrategy: packOrderStrategy ?? "largest_to_smallest",
     placementStrategy: packPlacementStrategy ?? "minimum_sum_squared_distance_to_network",
     minGap: gapMm,
-    obstacles: obstaclesFromRelativelyPositionedComponents,
     bounds
   };
   const clusterMap = applyComponentConstraintClusters(group, packInput);
@@ -19181,7 +19062,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.907",
+  version: "0.0.908",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19286,7 +19167,7 @@ var package_default = {
   dependencies: {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.65",
+    "calculate-packing": "0.0.66",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     nanoid: "^5.0.7",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.908",
+  "version": "0.0.909",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -106,7 +106,7 @@
   "dependencies": {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.65",
+    "calculate-packing": "0.0.66",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     "nanoid": "^5.0.7",