@tscircuit/core 0.0.844 → 0.0.846

package/dist/index.d.ts

@@ -340,6 +340,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     _parsedProps: z.infer<ZodProps>;
     get componentName(): string;
     getInheritedProperty(propertyName: string): any;
+    getInheritedMergedProperty(propertyName: string): any;
     get lowercaseComponentName(): string;
     externallyAddedAliases: string[];
     /**
@@ -24653,20 +24654,26 @@ declare class CopperPour extends PrimitiveComponent<typeof copperPourProps> {
             connectsTo: zod.ZodString;
             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>>;
+            coveredWithSolderMask: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
         }, "strip", zod.ZodTypeAny, {
             layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             connectsTo: string;
+            coveredWithSolderMask: boolean;
             name?: string | undefined;
             padMargin?: number | undefined;
             traceMargin?: number | undefined;
+            clearance?: number | undefined;
         }, {
             layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             };
             connectsTo: string;
             name?: string | undefined;
+            coveredWithSolderMask?: boolean | undefined;
             padMargin?: string | number | undefined;
             traceMargin?: string | number | undefined;
+            clearance?: string | number | undefined;
         }>;
     };
     getPcbSize(): {

package/dist/index.js

@@ -669,6 +669,11 @@ var PrimitiveComponent2 = class extends Renderable {
     }
     return void 0;
   }
+  getInheritedMergedProperty(propertyName) {
+    const parentPropertyObject = this.parent?.getInheritedMergedProperty?.(propertyName);
+    const myPropertyObject = this._parsedProps?.[propertyName];
+    return { ...parentPropertyObject, ...myPropertyObject };
+  }
   get lowercaseComponentName() {
     return this.componentName.toLowerCase();
   }
@@ -7479,9 +7484,12 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
       resolverFn = libMap;
     }
     if (!resolverFn) return;
+    const resolvedPcbStyle = component.getInheritedMergedProperty("pcbStyle");
     queueAsyncEffect("load-lib-footprint", async () => {
       try {
-        const result = await resolverFn(libRef.footprintName);
+        const result = await resolverFn(libRef.footprintName, {
+          resolvedPcbStyle
+        });
         let circuitJson = null;
         if (Array.isArray(result)) {
           circuitJson = result;
@@ -16316,216 +16324,10 @@ var Via = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/CopperPour/CopperPour.ts
 import { copperPourProps } from "@tscircuit/props";
-import { getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson4 } from "circuit-json-to-connectivity-map";
-import Flatten4 from "@flatten-js/core";
-
-// lib/components/primitive-components/CopperPour/utils/get-board-polygon.ts
-import Flatten from "@flatten-js/core";
-var getBoardPolygon = (board) => {
-  if (board.outline && board.outline.length > 0) {
-    return new Flatten.Polygon(
-      board.outline.map((p) => Flatten.point(p.x, p.y))
-    );
-  }
-  return new Flatten.Polygon(
-    new Flatten.Box(
-      board.center.x - board.width / 2,
-      board.center.y - board.height / 2,
-      board.center.x + board.width / 2,
-      board.center.y + board.height / 2
-    ).toPoints()
-  );
-};
-
-// lib/components/primitive-components/CopperPour/utils/get-trace-obstacles.ts
-var getTraceObstacles = (db, layer) => {
-  const traceObstacles = [];
-  for (const pcb_trace of db.pcb_trace.list()) {
-    if (!pcb_trace.route) continue;
-    const source_trace = pcb_trace.source_trace_id ? db.source_trace.get(pcb_trace.source_trace_id) : null;
-    const connectedToIds = /* @__PURE__ */ new Set();
-    if (pcb_trace.source_trace_id) {
-      connectedToIds.add(pcb_trace.source_trace_id);
-    }
-    if (source_trace) {
-      for (const id of source_trace.connected_source_net_ids)
-        connectedToIds.add(id);
-      for (const id of source_trace.connected_source_port_ids)
-        connectedToIds.add(id);
-    }
-    for (const pt of pcb_trace.route) {
-      if (pt.route_type === "wire") {
-        if (pt.start_pcb_port_id) {
-          const pcb_port = db.pcb_port.get(pt.start_pcb_port_id);
-          if (pcb_port?.source_port_id)
-            connectedToIds.add(pcb_port.source_port_id);
-        }
-        if (pt.end_pcb_port_id) {
-          const pcb_port = db.pcb_port.get(pt.end_pcb_port_id);
-          if (pcb_port?.source_port_id)
-            connectedToIds.add(pcb_port.source_port_id);
-        }
-      }
-    }
-    const connectedTo = Array.from(connectedToIds);
-    for (let i = 0; i < pcb_trace.route.length - 1; i++) {
-      const p1 = pcb_trace.route[i];
-      const p2 = pcb_trace.route[i + 1];
-      if (p1.route_type !== "wire" || p2.route_type !== "wire") continue;
-      if (p1.layer !== layer) continue;
-      const segmentWidth = p1.width;
-      if (segmentWidth === 0) continue;
-      const segmentLength = Math.hypot(p1.x - p2.x, p1.y - p2.y);
-      if (segmentLength === 0) continue;
-      const centerX = (p1.x + p2.x) / 2;
-      const centerY = (p1.y + p2.y) / 2;
-      const rotationDeg = Math.atan2(p2.y - p1.y, p2.x - p1.x) * 180 / Math.PI;
-      const rotatedRect = {
-        center: { x: centerX, y: centerY },
-        width: segmentLength,
-        height: segmentWidth,
-        rotation: rotationDeg
-      };
-      const approximatingRects = generateApproximatingRects(rotatedRect);
-      for (const rect of approximatingRects) {
-        traceObstacles.push({
-          type: "rect",
-          layers: [p1.layer],
-          center: rect.center,
-          width: rect.width,
-          height: rect.height,
-          connectedTo,
-          obstacle_type: "trace"
-        });
-      }
-    }
-  }
-  return traceObstacles;
-};
-
-// lib/components/primitive-components/CopperPour/utils/process-obstacles.ts
-import Flatten2 from "@flatten-js/core";
-var processObstaclesForPour = (obstacles, connMap, net, margins) => {
-  const rectObstaclesToSubtract = [];
-  const circularObstacles = [];
-  const { traceMargin, padMargin } = margins;
-  for (const obs of obstacles) {
-    const isOnNet = obs.connectedTo.some(
-      (id) => connMap.areIdsConnected(id, net.source_net_id)
-    );
-    if (isOnNet) {
-      continue;
-    }
-    if (obs.type === "oval" && obs.width === obs.height) {
-      const radius = obs.width / 2 + padMargin;
-      circularObstacles.push({
-        center: obs.center,
-        radius
-      });
-      continue;
-    }
-    if (obs.type === "rect" && obs.width === obs.height && obs.connectedTo.length === 0) {
-      const radius = obs.width / 2;
-      circularObstacles.push({
-        center: obs.center,
-        radius
-      });
-      continue;
-    }
-    const margin = traceMargin;
-    const b = new Flatten2.Box(
-      obs.center.x - obs.width / 2 - margin,
-      obs.center.y - obs.height / 2 - margin,
-      obs.center.x + obs.width / 2 + margin,
-      obs.center.y + obs.height / 2 + margin
-    );
-    rectObstaclesToSubtract.push(new Flatten2.Polygon(b.toPoints()));
-  }
-  return { rectObstaclesToSubtract, circularObstacles };
-};
-
-// lib/components/primitive-components/CopperPour/utils/generate-and-insert-brep.ts
-import Flatten3 from "@flatten-js/core";
-var faceToVertices = (face) => face.edges.map((e) => {
-  const pt = {
-    x: e.start.x,
-    y: e.start.y
-  };
-  if (e.isArc) {
-    const bulge = Math.tan(e.shape.sweep / 4);
-    if (Math.abs(bulge) > 1e-9) {
-      pt.bulge = bulge;
-    }
-  }
-  return pt;
-});
-var generateAndInsertBRep = (pourPolygons, circularObstacles, {
-  db,
-  copperPour
-}) => {
-  const props = copperPour._parsedProps;
-  const net = copperPour.getSubcircuit().selectOne(props.connectsTo);
-  const subcircuit = copperPour.getSubcircuit();
-  const polygons = Array.isArray(pourPolygons) ? pourPolygons : [pourPolygons];
-  for (const p of polygons) {
-    const islands = p.splitToIslands();
-    for (const island of islands) {
-      if (island.isEmpty()) continue;
-      const faces = [...island.faces];
-      const outer_face_ccw = faces.find(
-        (f) => f.orientation() === Flatten3.ORIENTATION.CCW
-      );
-      const inner_faces_cw = faces.filter(
-        (f) => f.orientation() === Flatten3.ORIENTATION.CW
-      );
-      if (!outer_face_ccw) continue;
-      if (!db.pcb_copper_pour) {
-        copperPour.renderError(
-          "db.pcb_copper_pour not found. The database schema may be outdated."
-        );
-        return;
-      }
-      outer_face_ccw.reverse();
-      const outer_ring_vertices = faceToVertices(outer_face_ccw);
-      const inner_rings = inner_faces_cw.map((f) => {
-        f.reverse();
-        return { vertices: faceToVertices(f) };
-      });
-      for (const circle of circularObstacles) {
-        const centerPoint = Flatten3.point(circle.center.x, circle.center.y);
-        const isContained = island.contains(centerPoint);
-        if (isContained) {
-          inner_rings.push({
-            vertices: [
-              {
-                x: circle.center.x,
-                y: circle.center.y - circle.radius,
-                bulge: 1
-              },
-              {
-                x: circle.center.x,
-                y: circle.center.y + circle.radius,
-                bulge: 1
-              }
-            ]
-          });
-        }
-      }
-      db.pcb_copper_pour.insert({
-        shape: "brep",
-        layer: props.layer,
-        brep_shape: {
-          outer_ring: { vertices: outer_ring_vertices },
-          inner_rings
-        },
-        source_net_id: net.source_net_id,
-        subcircuit_id: subcircuit?.subcircuit_id ?? void 0
-      });
-    }
-  }
-};
-
-// lib/components/primitive-components/CopperPour/CopperPour.ts
+import {
+  CopperPourPipelineSolver,
+  convertCircuitJsonToInputProblem
+} from "@tscircuit/copper-pour-solver";
 var CopperPour = class extends PrimitiveComponent2 {
   isPcbPrimitive = true;
   get config() {
@@ -16547,38 +16349,27 @@ var CopperPour = class extends PrimitiveComponent2 {
         this.renderError(`Net "${props.connectsTo}" not found for copper pour`);
         return;
       }
-      const board = db.pcb_board.list()[0];
-      if (!board) {
-        this.renderError("No board found for copper pour");
-        return;
-      }
-      const boardPolygon = getBoardPolygon(board);
-      const connMap = getFullConnectivityMapFromCircuitJson4(db.toArray());
-      const obstaclesRaw = getObstaclesFromCircuitJson(
-        db.toArray(),
-        connMap
-      ).filter((o) => o.layers.includes(props.layer));
-      obstaclesRaw.push(...getTraceObstacles(db, props.layer));
-      const { rectObstaclesToSubtract, circularObstacles } = processObstaclesForPour(obstaclesRaw, connMap, net, {
-        traceMargin: props.traceMargin ?? 0.2,
-        padMargin: props.padMargin ?? 0.2
+      const subcircuit = this.getSubcircuit();
+      const sourceNet = db.toArray().filter(
+        (elm) => elm.type === "source_net" && elm.name === net.name
+      )[0] || "";
+      const inputProblem = convertCircuitJsonToInputProblem(db.toArray(), {
+        layer: props.layer,
+        pour_connectivity_key: sourceNet.subcircuit_connectivity_map_key || "",
+        pad_margin: props.padMargin ?? 0.2,
+        trace_margin: props.traceMargin ?? 0.2
       });
-      let pourPolygons = boardPolygon;
-      if (rectObstaclesToSubtract.length > 0) {
-        const obstacleUnion = rectObstaclesToSubtract.reduce(
-          (acc, p) => Flatten4.BooleanOperations.unify(acc, p)
-        );
-        if (obstacleUnion && !obstacleUnion.isEmpty()) {
-          pourPolygons = Flatten4.BooleanOperations.subtract(
-            boardPolygon,
-            obstacleUnion
-          );
-        }
+      const solver = new CopperPourPipelineSolver(inputProblem);
+      const { brep_shapes } = solver.getOutput();
+      for (const brep_shape of brep_shapes) {
+        db.pcb_copper_pour.insert({
+          shape: "brep",
+          layer: props.layer,
+          brep_shape,
+          source_net_id: net.source_net_id,
+          subcircuit_id: subcircuit?.subcircuit_id ?? void 0
+        });
       }
-      generateAndInsertBRep(pourPolygons, circularObstacles, {
-        db,
-        copperPour: this
-      });
     });
   }
 };
@@ -17821,7 +17612,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.843",
+  version: "0.0.845",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -17856,6 +17647,7 @@ var package_default = {
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@tscircuit/common": "^0.0.20",
+    "@tscircuit/copper-pour-solver": "^0.0.2",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -17864,10 +17656,11 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.2",
-    "@tscircuit/props": "^0.0.390",
+    "@tscircuit/props": "^0.0.393",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.43",
+    "@tscircuit/solver-utils": "^0.0.3",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
     "@types/react": "^19.1.8",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.844",
+  "version": "0.0.846",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,6 +36,7 @@
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@tscircuit/common": "^0.0.20",
+    "@tscircuit/copper-pour-solver": "^0.0.2",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -44,10 +45,11 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.2",
-    "@tscircuit/props": "^0.0.390",
+    "@tscircuit/props": "^0.0.393",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.43",
+    "@tscircuit/solver-utils": "^0.0.3",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
     "@types/react": "^19.1.8",