@tscircuit/core 0.0.1967 → 0.0.1969

package/dist/index.d.ts

@@ -369,9 +369,9 @@ interface IIsolatedCircuit {
 interface IRootCircuit extends IIsolatedCircuit {
 }
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "ResolveFootprintPinLabels", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "CheckRefDesConvention", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "SchematicLabelNetsWithConflictingNames", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbFlexRender", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbPlacementDesignRuleChecks", "PcbTraceRender", "PcbRouteNetIslands", "PcbImplicitCopperPourRender", "PcbCopperPourRender", "PcbViaStitchRender", "PcbCopperPourCleanup", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "PartOrientationAnalysis", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "ResolveFootprintPinLabels", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "CheckRefDesConvention", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "SchematicLabelNetsWithConflictingNames", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbFlexRender", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbPlacementDesignRuleChecks", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbViaStitchRender", "PcbCopperPourCleanup", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "PartOrientationAnalysis", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
-declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "ResolveFootprintPinLabels" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "CheckRefDesConvention" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "SchematicLabelNetsWithConflictingNames" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbFlexRender" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbPlacementDesignRuleChecks" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbImplicitCopperPourRender" | "PcbCopperPourRender" | "PcbViaStitchRender" | "PcbCopperPourCleanup" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "PartOrientationAnalysis" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
+declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "ResolveFootprintPinLabels" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "CheckRefDesConvention" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "SchematicLabelNetsWithConflictingNames" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbFlexRender" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbPlacementDesignRuleChecks" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbCopperPourRender" | "PcbViaStitchRender" | "PcbCopperPourCleanup" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "PartOrientationAnalysis" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
     initialized: boolean;
@@ -6251,7 +6251,6 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
     removePcbComponentRender(): void;
     doInitialPcbDesignRuleChecks(): void;
     doInitialPcbPlacementDesignRuleChecks(): void;
-    doInitialPcbImplicitCopperPourRender(): void;
     _generatedStitchingViaIds: Set<string>;
     doInitialPcbCopperPourCleanup(): void;
     updatePcbDesignRuleChecks(): void;

package/dist/index.js

@@ -484,7 +484,6 @@ var orderedRenderPhases = [
   "PcbPlacementDesignRuleChecks",
   "PcbTraceRender",
   "PcbRouteNetIslands",
-  "PcbImplicitCopperPourRender",
   "PcbCopperPourRender",
   "PcbViaStitchRender",
   "PcbCopperPourCleanup",
@@ -535,14 +534,6 @@ var asyncPhaseDependencies = {
   PcbTraceHintRender: ["PcbFootprintStringRender", "FetchPartFootprint"],
   PcbManualTraceRender: ["PcbFootprintStringRender", "FetchPartFootprint"],
   PcbCopperPourRender: [
-    "PcbFootprintStringRender",
-    "FetchPartFootprint",
-    "PcbPlacementDesignRuleChecks",
-    "PcbTraceRender",
-    "PcbRouteNetIslands",
-    "PcbImplicitCopperPourRender"
-  ],
-  PcbImplicitCopperPourRender: [
     "PcbFootprintStringRender",
     "FetchPartFootprint",
     "PcbPlacementDesignRuleChecks",
@@ -555,7 +546,6 @@ var asyncPhaseDependencies = {
     "PcbPlacementDesignRuleChecks",
     "PcbTraceRender",
     "PcbRouteNetIslands",
-    "PcbImplicitCopperPourRender",
     "PcbCopperPourRender"
   ],
   PcbPlacementDesignRuleChecks: [
@@ -568,7 +558,6 @@ var asyncPhaseDependencies = {
     "PcbPlacementDesignRuleChecks",
     "PcbTraceRender",
     "PcbRouteNetIslands",
-    "PcbImplicitCopperPourRender",
     "PcbCopperPourRender",
     "PcbViaStitchRender"
   ],
@@ -583,7 +572,6 @@ var asyncPhaseDependencies = {
     "FetchPartFootprint",
     "PcbPlacementDesignRuleChecks",
     "PcbTraceRender",
-    "PcbImplicitCopperPourRender",
     "PcbCopperPourRender",
     "PcbViaStitchRender",
     "PcbCopperPourCleanup"
@@ -63800,7 +63788,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1966",
+  version: "0.0.1968",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -63839,7 +63827,7 @@ var package_default = {
     "@tscircuit/checks": "^0.0.208",
     "@tscircuit/circuit-json-util": "^0.0.116",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.56",
+    "@tscircuit/copper-pour-solver": "^0.0.57",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
     "@tscircuit/fanout-solver": "0.0.78",
     "@tscircuit/footprinter": "^0.0.426",
@@ -68903,382 +68891,6 @@ function Subcircuit_getSubcircuitPropHash(subcircuit) {
   return computeHash(hashableData);
 }
 
-// lib/components/primitive-components/CopperPour/CopperPour.ts
-import { copperPourProps } from "@tscircuit/props";
-
-// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbCopperPourRender.ts
-import {
-  CopperPourPipelineSolver as CopperPourPipelineSolver2,
-  convertCircuitJsonToInputProblem,
-  initializeManifoldGeometry
-} from "@tscircuit/copper-pour-solver";
-
-// lib/components/primitive-components/CopperPour/utils/mark-trace-segments-inside-copper-pour.ts
-var EPSILON24 = 1e-9;
-var isWireRoutePoint = (routePoint) => routePoint.route_type === "wire";
-var isPointOnSegment2 = (p, a, b) => {
-  const cross4 = (p.y - a.y) * (b.x - a.x) - (p.x - a.x) * (b.y - a.y);
-  if (Math.abs(cross4) > EPSILON24) return false;
-  const dot = (p.x - a.x) * (b.x - a.x) + (p.y - a.y) * (b.y - a.y);
-  if (dot < -EPSILON24) return false;
-  const squaredLength = (b.x - a.x) ** 2 + (b.y - a.y) ** 2;
-  if (dot - squaredLength > EPSILON24) return false;
-  return true;
-};
-var isPointInRing2 = (point6, ring) => {
-  if (ring.length < 3) return false;
-  let inside2 = false;
-  let previous = ring[ring.length - 1];
-  for (const current of ring) {
-    if (isPointOnSegment2(point6, previous, current)) return true;
-    const intersects = current.y > point6.y !== previous.y > point6.y && point6.x < (previous.x - current.x) * (point6.y - current.y) / (previous.y - current.y) + current.x;
-    if (intersects) inside2 = !inside2;
-    previous = current;
-  }
-  return inside2;
-};
-var isPointInRectPour = (p, pour) => {
-  const { center, width, height } = pour;
-  const rotationRad = (pour.rotation ?? 0) * Math.PI / 180;
-  const cosR = Math.cos(-rotationRad);
-  const sinR = Math.sin(-rotationRad);
-  const dx = p.x - center.x;
-  const dy = p.y - center.y;
-  const localX = dx * cosR - dy * sinR;
-  const localY = dx * sinR + dy * cosR;
-  return Math.abs(localX) <= width / 2 + EPSILON24 && Math.abs(localY) <= height / 2 + EPSILON24;
-};
-var isPointInBrepPour = (p, pour) => {
-  const outerRing = pour.brep_shape.outer_ring.vertices.map((v) => ({
-    x: v.x,
-    y: v.y
-  }));
-  if (!isPointInRing2(p, outerRing)) return false;
-  for (const innerRing of pour.brep_shape.inner_rings) {
-    const points = innerRing.vertices.map((v) => ({ x: v.x, y: v.y }));
-    if (isPointInRing2(p, points)) return false;
-  }
-  return true;
-};
-var isPointInCopperPour = (point6, pour) => {
-  if (pour.shape === "rect") {
-    return isPointInRectPour(point6, pour);
-  }
-  if (pour.shape === "brep") {
-    return isPointInBrepPour(point6, pour);
-  }
-  return false;
-};
-var isTraceConnectedToSourceNet = (trace, sourceNetId, sourceTraceById) => {
-  if (trace.source_trace_id === sourceNetId) return true;
-  if (!trace.source_trace_id) return false;
-  const sourceTrace = sourceTraceById.get(trace.source_trace_id);
-  if (!sourceTrace) return false;
-  return sourceTrace.connected_source_net_ids.includes(sourceNetId);
-};
-var isSegmentFullyInsideCopperPour = (start, end, pour) => {
-  const dx = end.x - start.x;
-  const dy = end.y - start.y;
-  const length8 = Math.hypot(dx, dy);
-  if (length8 <= EPSILON24) return false;
-  const samples = [0, 0.25, 0.5, 0.75, 1];
-  return samples.every(
-    (t) => isPointInCopperPour(
-      {
-        x: start.x + dx * t,
-        y: start.y + dy * t
-      },
-      pour
-    )
-  );
-};
-var markTraceSegmentsInsideCopperPour = ({
-  db,
-  copperPour
-}) => {
-  if (!copperPour.source_net_id) return;
-  const sourceTraceById = new Map(
-    db.source_trace.list().map((sourceTrace) => [sourceTrace.source_trace_id, sourceTrace])
-  );
-  for (const trace of db.pcb_trace.list()) {
-    if (!isTraceConnectedToSourceNet(
-      trace,
-      copperPour.source_net_id,
-      sourceTraceById
-    )) {
-      continue;
-    }
-    let routeChanged = false;
-    const nextRoute = trace.route.map((routePoint) => ({ ...routePoint }));
-    for (let i = 0; i < nextRoute.length - 1; i++) {
-      const fromRoutePoint = nextRoute[i];
-      const toRoutePoint = nextRoute[i + 1];
-      if (!fromRoutePoint || !toRoutePoint) continue;
-      if (!isWireRoutePoint(fromRoutePoint) || !isWireRoutePoint(toRoutePoint))
-        continue;
-      if (fromRoutePoint.layer !== copperPour.layer || toRoutePoint.layer !== copperPour.layer)
-        continue;
-      if (isSegmentFullyInsideCopperPour(
-        { x: fromRoutePoint.x, y: fromRoutePoint.y },
-        { x: toRoutePoint.x, y: toRoutePoint.y },
-        copperPour
-      )) {
-        fromRoutePoint.is_inside_copper_pour = true;
-        fromRoutePoint.copper_pour_id = copperPour.pcb_copper_pour_id;
-        toRoutePoint.is_inside_copper_pour = true;
-        toRoutePoint.copper_pour_id = copperPour.pcb_copper_pour_id;
-        routeChanged = true;
-      }
-    }
-    if (routeChanged) {
-      db.pcb_trace.update(trace.pcb_trace_id, { route: nextRoute });
-    }
-  }
-};
-
-// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbCopperPourRender.ts
-var pendingCopperPourRenders = /* @__PURE__ */ new WeakMap();
-var DEFAULT_THERMAL_RELIEF_SPOKE_WIDTH_MM = 0.3;
-var renderAllCopperPoursForSubcircuit = async (subcircuit) => {
-  if (!subcircuit.root) return;
-  const { db } = subcircuit.root;
-  const copperPours = subcircuit.selectAll("copperpour").filter((copperPour) => copperPour.getSubcircuit() === subcircuit);
-  const resolvedCopperPours = [];
-  for (const copperPour of copperPours) {
-    const { _parsedProps: props } = copperPour;
-    const net = subcircuit.selectOne(props.connectsTo);
-    const sourceNetId = net?.source_net_id;
-    if (!sourceNetId) {
-      copperPour.renderError(
-        `Net "${props.connectsTo}" not found for copper pour`
-      );
-      continue;
-    }
-    resolvedCopperPours.push({ copperPour, sourceNetId });
-  }
-  if (resolvedCopperPours.length === 0) return;
-  const circuitJson = db.toArray();
-  const boardComponent = subcircuit._getBoard();
-  const pcbBoard = boardComponent?.pcb_board_id ? db.pcb_board.get(boardComponent.pcb_board_id) : void 0;
-  let resolvedPcbBoardOutline = pcbBoard?.outline?.length ? pcbBoard.outline : void 0;
-  if (!resolvedPcbBoardOutline && pcbBoard?.width !== void 0 && pcbBoard.height !== void 0) {
-    const { center, width, height } = pcbBoard;
-    resolvedPcbBoardOutline = [
-      { x: center.x - width / 2, y: center.y - height / 2 },
-      { x: center.x + width / 2, y: center.y - height / 2 },
-      { x: center.x + width / 2, y: center.y + height / 2 },
-      { x: center.x - width / 2, y: center.y + height / 2 }
-    ];
-  }
-  const inputProblem = convertCircuitJsonToInputProblem(
-    circuitJson,
-    resolvedCopperPours.map(({ copperPour, sourceNetId }) => {
-      const { _parsedProps: props } = copperPour;
-      const clearance = props.clearance ?? 0.2;
-      return {
-        layer: props.layer,
-        subcircuit_id: subcircuit.subcircuit_id ?? void 0,
-        source_net_id: sourceNetId,
-        pad_margin: props.padMargin ?? clearance,
-        trace_margin: props.traceMargin ?? clearance,
-        pour_margin: clearance,
-        board_edge_margin: props.boardEdgeMargin ?? clearance,
-        board_edge_outline: copperPour._isImplicitCopperPour ? resolvedPcbBoardOutline : void 0,
-        cutout_margin: props.cutoutMargin ?? clearance,
-        ...props.useThermalReliefs ? {
-          use_thermal_reliefs: true,
-          thermal_relief_spoke_width: DEFAULT_THERMAL_RELIEF_SPOKE_WIDTH_MM
-        } : {},
-        outline: props.outline ?? resolvedPcbBoardOutline
-      };
-    })
-  );
-  await initializeManifoldGeometry();
-  const solver = new CopperPourPipelineSolver2(inputProblem);
-  subcircuit.root.emit("solver:started", {
-    type: "solver:started",
-    solverName: "CopperPourPipelineSolver",
-    solverParams: inputProblem,
-    solverConstructorArgs: [inputProblem],
-    componentName: subcircuit.getString()
-  });
-  const { brep_shapes_by_region } = solver.getOutput();
-  for (const [
-    regionIndex,
-    { copperPour, sourceNetId }
-  ] of resolvedCopperPours.entries()) {
-    const { _parsedProps: props } = copperPour;
-    const coveredWithSolderMask = props.coveredWithSolderMask ?? false;
-    for (const brepShape of brep_shapes_by_region[regionIndex] ?? []) {
-      const insertedPour = db.pcb_copper_pour.insert({
-        shape: "brep",
-        layer: props.layer,
-        brep_shape: brepShape,
-        source_net_id: sourceNetId,
-        subcircuit_id: subcircuit.subcircuit_id ?? void 0,
-        covered_with_solder_mask: coveredWithSolderMask
-      });
-      markTraceSegmentsInsideCopperPour({
-        db,
-        copperPour: insertedPour
-      });
-    }
-  }
-};
-function CopperPour_doInitialPcbCopperPourRender(copperPour) {
-  if (copperPour.root?.pcbDisabled) return;
-  copperPour._queueAsyncEffect("PcbCopperPourRender", async () => {
-    const subcircuit = copperPour.getSubcircuit();
-    const pendingRender = pendingCopperPourRenders.get(subcircuit);
-    if (pendingRender) {
-      await pendingRender;
-      return;
-    }
-    const renderPromise = renderAllCopperPoursForSubcircuit(subcircuit);
-    pendingCopperPourRenders.set(subcircuit, renderPromise);
-    try {
-      await renderPromise;
-    } finally {
-      pendingCopperPourRenders.delete(subcircuit);
-    }
-  });
-}
-
-// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbViaStitchRender.ts
-import { pcb_via as pcb_via3 } from "circuit-json";
-var renderViaStitchingForCopperPours = (copperPour) => {
-  const subcircuit = copperPour.getSubcircuit();
-  if (!subcircuit.root) return;
-  const copperPours = subcircuit.selectAll("copperpour").filter(
-    (candidateCopperPour) => candidateCopperPour.getSubcircuit() === subcircuit
-  );
-  if (copperPours[0] !== copperPour) return;
-  const sourceNetIds = copperPours.flatMap((candidateCopperPour) => {
-    const net = subcircuit.selectOne(
-      candidateCopperPour._parsedProps.connectsTo
-    );
-    return net?.source_net_id ? [net.source_net_id] : [];
-  });
-  if (sourceNetIds.length === 0) return;
-  const { db } = subcircuit.root;
-  const pcbStyle = copperPour.getInheritedMergedProperty("pcbStyle");
-  const { holeDiameter, padDiameter } = getViaDiameterDefaults(pcbStyle);
-  const boardComponent = copperPour._getBoard();
-  const pcbBoard = boardComponent?.pcb_board_id ? db.pcb_board.get(boardComponent.pcb_board_id) : void 0;
-  const solverInput = {
-    circuitJson: db.toArray(),
-    options: {
-      sourceNetIds: [...new Set(sourceNetIds)],
-      viaHoleDiameter: pcbBoard?.min_via_hole_diameter ?? holeDiameter,
-      viaOuterDiameter: pcbBoard?.min_via_pad_diameter ?? padDiameter,
-      viaStitchPitch: boardComponent?._parsedProps.viaStitchPitch
-    }
-  };
-  const solver = new ViaStitchSolver(solverInput);
-  subcircuit.root.emit("solver:started", {
-    type: "solver:started",
-    solverName: "ViaStitchSolver",
-    solverParams: solverInput,
-    solverConstructorArgs: [solverInput],
-    componentName: subcircuit.getString()
-  });
-  solver.solve();
-  if (solver.failed) {
-    throw new Error(solver.error ?? "Via stitching solver failed");
-  }
-  for (const pcbVia of solver.getOutput().pcbVias) {
-    const { pcb_via_id: _solverViaId, ...pcbViaInput } = pcb_via3.parse(pcbVia);
-    const insertedVia = db.pcb_via.insert({
-      ...pcbViaInput,
-      tented_on_top: void 0,
-      tented_on_bottom: void 0
-    });
-    boardComponent?._generatedStitchingViaIds?.add(insertedVia.pcb_via_id);
-  }
-};
-function CopperPour_doInitialPcbViaStitchRender(copperPour) {
-  if (copperPour.root?.pcbDisabled || !copperPour.root?._featurePcbViaStitching)
-    return;
-  if (!copperPour._getBoard()?._parsedProps.enableViaStitching) return;
-  copperPour._queueAsyncEffect("PcbViaStitchRender", async () => {
-    renderViaStitchingForCopperPours(copperPour);
-  });
-}
-
-// lib/components/primitive-components/CopperPour/CopperPour.ts
-var CopperPour = class extends PrimitiveComponent2 {
-  isPcbPrimitive = true;
-  _isImplicitCopperPour = false;
-  get config() {
-    return {
-      componentName: "CopperPour",
-      zodProps: copperPourProps
-    };
-  }
-  getPcbSize() {
-    return { width: 0, height: 0 };
-  }
-  doInitialCreateNetsFromProps() {
-    const { _parsedProps: props } = this;
-    createNetsFromProps(this, [props.connectsTo]);
-  }
-  doInitialPcbCopperPourRender() {
-    CopperPour_doInitialPcbCopperPourRender(this);
-  }
-  doInitialPcbViaStitchRender() {
-    CopperPour_doInitialPcbViaStitchRender(this);
-  }
-};
-
-// lib/components/normal-components/Board_doInitialPcbImplicitCopperPourRender.ts
-var Board_doInitialPcbImplicitCopperPourRender = (board) => {
-  const { root } = board;
-  if (!root || root.pcbDisabled) return;
-  if (!board._parsedProps.automaticPoursEnabled) return;
-  if (root.pcbRoutingDisabled || board.getInheritedProperty("routingDisabled"))
-    return;
-  const { db } = root;
-  const circuitJson = db.subtree({ subcircuit_id: board.subcircuit_id }).toArray();
-  const hasPowerNet = circuitJson.some(
-    (element) => element.type === "source_net" && (element.is_power || element.is_ground || element.is_positive_voltage_source)
-  );
-  if (!hasPowerNet) return;
-  const inputProblem = {
-    circuitJson,
-    layers: [...board.allLayers]
-  };
-  const solver = new ImplicitCopperPourPipelineSolver(inputProblem);
-  const solverConstructorArgs = solver.getConstructorParams();
-  root.emit("solver:started", {
-    type: "solver:started",
-    solverName: "ImplicitCopperPourPipelineSolver",
-    solverParams: solverConstructorArgs[0],
-    solverConstructorArgs,
-    componentName: board.getString()
-  });
-  solver.solve();
-  const boardNets = board.selectAll("net");
-  for (const implicitRegion of solver.getOutput()) {
-    if (implicitRegion.shape !== "polygon") continue;
-    const owningNet = boardNets.find(
-      (net) => net.source_net_id === implicitRegion.source_net_id
-    );
-    if (!owningNet) {
-      throw new Error(
-        `Unable to find the power net for implicit copper region ${implicitRegion.pcb_copper_pour_id}`
-      );
-    }
-    const copperPour = new CopperPour({
-      layer: implicitRegion.layer,
-      connectsTo: owningNet.getPortSelector(),
-      outline: implicitRegion.points,
-      coveredWithSolderMask: implicitRegion.covered_with_solder_mask
-    });
-    copperPour._isImplicitCopperPour = true;
-    owningNet.getSubcircuit().add(copperPour);
-  }
-};
-
 // lib/utils/copper-pour-connectivity/find-floating-copper.ts
 import {
   getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson5
@@ -70112,9 +69724,6 @@ var Board = class extends Group5 {
   doInitialPcbPlacementDesignRuleChecks() {
     Board_doInitialPcbPlacementDesignRuleChecks(this);
   }
-  doInitialPcbImplicitCopperPourRender() {
-    Board_doInitialPcbImplicitCopperPourRender(this);
-  }
   _generatedStitchingViaIds = /* @__PURE__ */ new Set();
   doInitialPcbCopperPourCleanup() {
     Board_doInitialPcbCopperPourCleanup(this);
@@ -75753,6 +75362,333 @@ var Fiducial = class extends PrimitiveComponent2 {
   }
 };
 
+// lib/components/primitive-components/CopperPour/CopperPour.ts
+import { copperPourProps } from "@tscircuit/props";
+
+// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbCopperPourRender.ts
+import {
+  CopperPourPipelineSolver as CopperPourPipelineSolver2,
+  convertCircuitJsonToInputProblem,
+  initializeManifoldGeometry
+} from "@tscircuit/copper-pour-solver";
+
+// lib/components/primitive-components/CopperPour/utils/mark-trace-segments-inside-copper-pour.ts
+var EPSILON24 = 1e-9;
+var isWireRoutePoint = (routePoint) => routePoint.route_type === "wire";
+var isPointOnSegment2 = (p, a, b) => {
+  const cross4 = (p.y - a.y) * (b.x - a.x) - (p.x - a.x) * (b.y - a.y);
+  if (Math.abs(cross4) > EPSILON24) return false;
+  const dot = (p.x - a.x) * (b.x - a.x) + (p.y - a.y) * (b.y - a.y);
+  if (dot < -EPSILON24) return false;
+  const squaredLength = (b.x - a.x) ** 2 + (b.y - a.y) ** 2;
+  if (dot - squaredLength > EPSILON24) return false;
+  return true;
+};
+var isPointInRing2 = (point6, ring) => {
+  if (ring.length < 3) return false;
+  let inside2 = false;
+  let previous = ring[ring.length - 1];
+  for (const current of ring) {
+    if (isPointOnSegment2(point6, previous, current)) return true;
+    const intersects = current.y > point6.y !== previous.y > point6.y && point6.x < (previous.x - current.x) * (point6.y - current.y) / (previous.y - current.y) + current.x;
+    if (intersects) inside2 = !inside2;
+    previous = current;
+  }
+  return inside2;
+};
+var isPointInRectPour = (p, pour) => {
+  const { center, width, height } = pour;
+  const rotationRad = (pour.rotation ?? 0) * Math.PI / 180;
+  const cosR = Math.cos(-rotationRad);
+  const sinR = Math.sin(-rotationRad);
+  const dx = p.x - center.x;
+  const dy = p.y - center.y;
+  const localX = dx * cosR - dy * sinR;
+  const localY = dx * sinR + dy * cosR;
+  return Math.abs(localX) <= width / 2 + EPSILON24 && Math.abs(localY) <= height / 2 + EPSILON24;
+};
+var isPointInBrepPour = (p, pour) => {
+  const outerRing = pour.brep_shape.outer_ring.vertices.map((v) => ({
+    x: v.x,
+    y: v.y
+  }));
+  if (!isPointInRing2(p, outerRing)) return false;
+  for (const innerRing of pour.brep_shape.inner_rings) {
+    const points = innerRing.vertices.map((v) => ({ x: v.x, y: v.y }));
+    if (isPointInRing2(p, points)) return false;
+  }
+  return true;
+};
+var isPointInCopperPour = (point6, pour) => {
+  if (pour.shape === "rect") {
+    return isPointInRectPour(point6, pour);
+  }
+  if (pour.shape === "brep") {
+    return isPointInBrepPour(point6, pour);
+  }
+  return false;
+};
+var isTraceConnectedToSourceNet = (trace, sourceNetId, sourceTraceById) => {
+  if (trace.source_trace_id === sourceNetId) return true;
+  if (!trace.source_trace_id) return false;
+  const sourceTrace = sourceTraceById.get(trace.source_trace_id);
+  if (!sourceTrace) return false;
+  return sourceTrace.connected_source_net_ids.includes(sourceNetId);
+};
+var isSegmentFullyInsideCopperPour = (start, end, pour) => {
+  const dx = end.x - start.x;
+  const dy = end.y - start.y;
+  const length8 = Math.hypot(dx, dy);
+  if (length8 <= EPSILON24) return false;
+  const samples = [0, 0.25, 0.5, 0.75, 1];
+  return samples.every(
+    (t) => isPointInCopperPour(
+      {
+        x: start.x + dx * t,
+        y: start.y + dy * t
+      },
+      pour
+    )
+  );
+};
+var markTraceSegmentsInsideCopperPour = ({
+  db,
+  copperPour
+}) => {
+  if (!copperPour.source_net_id) return;
+  const sourceTraceById = new Map(
+    db.source_trace.list().map((sourceTrace) => [sourceTrace.source_trace_id, sourceTrace])
+  );
+  for (const trace of db.pcb_trace.list()) {
+    if (!isTraceConnectedToSourceNet(
+      trace,
+      copperPour.source_net_id,
+      sourceTraceById
+    )) {
+      continue;
+    }
+    let routeChanged = false;
+    const nextRoute = trace.route.map((routePoint) => ({ ...routePoint }));
+    for (let i = 0; i < nextRoute.length - 1; i++) {
+      const fromRoutePoint = nextRoute[i];
+      const toRoutePoint = nextRoute[i + 1];
+      if (!fromRoutePoint || !toRoutePoint) continue;
+      if (!isWireRoutePoint(fromRoutePoint) || !isWireRoutePoint(toRoutePoint))
+        continue;
+      if (fromRoutePoint.layer !== copperPour.layer || toRoutePoint.layer !== copperPour.layer)
+        continue;
+      if (isSegmentFullyInsideCopperPour(
+        { x: fromRoutePoint.x, y: fromRoutePoint.y },
+        { x: toRoutePoint.x, y: toRoutePoint.y },
+        copperPour
+      )) {
+        fromRoutePoint.is_inside_copper_pour = true;
+        fromRoutePoint.copper_pour_id = copperPour.pcb_copper_pour_id;
+        toRoutePoint.is_inside_copper_pour = true;
+        toRoutePoint.copper_pour_id = copperPour.pcb_copper_pour_id;
+        routeChanged = true;
+      }
+    }
+    if (routeChanged) {
+      db.pcb_trace.update(trace.pcb_trace_id, { route: nextRoute });
+    }
+  }
+};
+
+// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbCopperPourRender.ts
+var pendingCopperPourRenders = /* @__PURE__ */ new WeakMap();
+var DEFAULT_THERMAL_RELIEF_SPOKE_WIDTH_MM = 0.3;
+var renderAllCopperPoursForSubcircuit = async (subcircuit) => {
+  if (!subcircuit.root) return;
+  const { db } = subcircuit.root;
+  const copperPours = subcircuit.selectAll("copperpour").filter((copperPour) => copperPour.getSubcircuit() === subcircuit);
+  const resolvedCopperPours = [];
+  for (const copperPour of copperPours) {
+    const { _parsedProps: props } = copperPour;
+    const net = subcircuit.selectOne(props.connectsTo);
+    const sourceNetId = net?.source_net_id;
+    if (!sourceNetId) {
+      copperPour.renderError(
+        `Net "${props.connectsTo}" not found for copper pour`
+      );
+      continue;
+    }
+    resolvedCopperPours.push({ copperPour, sourceNetId });
+  }
+  if (resolvedCopperPours.length === 0) return;
+  const circuitJson = db.toArray();
+  const boardComponent = subcircuit._getBoard();
+  const pcbBoard = boardComponent?.pcb_board_id ? db.pcb_board.get(boardComponent.pcb_board_id) : void 0;
+  let resolvedPcbBoardOutline = pcbBoard?.outline?.length ? pcbBoard.outline : void 0;
+  if (!resolvedPcbBoardOutline && pcbBoard?.width !== void 0 && pcbBoard.height !== void 0) {
+    const { center, width, height } = pcbBoard;
+    resolvedPcbBoardOutline = [
+      { x: center.x - width / 2, y: center.y - height / 2 },
+      { x: center.x + width / 2, y: center.y - height / 2 },
+      { x: center.x + width / 2, y: center.y + height / 2 },
+      { x: center.x - width / 2, y: center.y + height / 2 }
+    ];
+  }
+  const inputProblem = convertCircuitJsonToInputProblem(
+    circuitJson,
+    resolvedCopperPours.map(({ copperPour, sourceNetId }) => {
+      const { _parsedProps: props } = copperPour;
+      const clearance = props.clearance ?? 0.2;
+      return {
+        layer: props.layer,
+        subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+        source_net_id: sourceNetId,
+        pad_margin: props.padMargin ?? clearance,
+        trace_margin: props.traceMargin ?? clearance,
+        pour_margin: clearance,
+        board_edge_margin: props.boardEdgeMargin ?? clearance,
+        board_edge_outline: copperPour._isImplicitCopperPour ? resolvedPcbBoardOutline : void 0,
+        cutout_margin: props.cutoutMargin ?? clearance,
+        ...props.useThermalReliefs ? {
+          use_thermal_reliefs: true,
+          thermal_relief_spoke_width: DEFAULT_THERMAL_RELIEF_SPOKE_WIDTH_MM
+        } : {},
+        outline: props.outline ?? resolvedPcbBoardOutline
+      };
+    })
+  );
+  await initializeManifoldGeometry();
+  const solver = new CopperPourPipelineSolver2(inputProblem);
+  subcircuit.root.emit("solver:started", {
+    type: "solver:started",
+    solverName: "CopperPourPipelineSolver",
+    solverParams: inputProblem,
+    solverConstructorArgs: [inputProblem],
+    componentName: subcircuit.getString()
+  });
+  const { brep_shapes_by_region } = solver.getOutput();
+  for (const [
+    regionIndex,
+    { copperPour, sourceNetId }
+  ] of resolvedCopperPours.entries()) {
+    const { _parsedProps: props } = copperPour;
+    const coveredWithSolderMask = props.coveredWithSolderMask ?? false;
+    for (const brepShape of brep_shapes_by_region[regionIndex] ?? []) {
+      const insertedPour = db.pcb_copper_pour.insert({
+        shape: "brep",
+        layer: props.layer,
+        brep_shape: brepShape,
+        source_net_id: sourceNetId,
+        subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+        covered_with_solder_mask: coveredWithSolderMask
+      });
+      markTraceSegmentsInsideCopperPour({
+        db,
+        copperPour: insertedPour
+      });
+    }
+  }
+};
+function CopperPour_doInitialPcbCopperPourRender(copperPour) {
+  if (copperPour.root?.pcbDisabled) return;
+  copperPour._queueAsyncEffect("PcbCopperPourRender", async () => {
+    const subcircuit = copperPour.getSubcircuit();
+    const pendingRender = pendingCopperPourRenders.get(subcircuit);
+    if (pendingRender) {
+      await pendingRender;
+      return;
+    }
+    const renderPromise = renderAllCopperPoursForSubcircuit(subcircuit);
+    pendingCopperPourRenders.set(subcircuit, renderPromise);
+    try {
+      await renderPromise;
+    } finally {
+      pendingCopperPourRenders.delete(subcircuit);
+    }
+  });
+}
+
+// lib/components/primitive-components/CopperPour/CopperPour_doInitialPcbViaStitchRender.ts
+import { pcb_via as pcb_via3 } from "circuit-json";
+var renderViaStitchingForCopperPours = (copperPour) => {
+  const subcircuit = copperPour.getSubcircuit();
+  if (!subcircuit.root) return;
+  const copperPours = subcircuit.selectAll("copperpour").filter(
+    (candidateCopperPour) => candidateCopperPour.getSubcircuit() === subcircuit
+  );
+  if (copperPours[0] !== copperPour) return;
+  const sourceNetIds = copperPours.flatMap((candidateCopperPour) => {
+    const net = subcircuit.selectOne(
+      candidateCopperPour._parsedProps.connectsTo
+    );
+    return net?.source_net_id ? [net.source_net_id] : [];
+  });
+  if (sourceNetIds.length === 0) return;
+  const { db } = subcircuit.root;
+  const pcbStyle = copperPour.getInheritedMergedProperty("pcbStyle");
+  const { holeDiameter, padDiameter } = getViaDiameterDefaults(pcbStyle);
+  const boardComponent = copperPour._getBoard();
+  const pcbBoard = boardComponent?.pcb_board_id ? db.pcb_board.get(boardComponent.pcb_board_id) : void 0;
+  const solverInput = {
+    circuitJson: db.toArray(),
+    options: {
+      sourceNetIds: [...new Set(sourceNetIds)],
+      viaHoleDiameter: pcbBoard?.min_via_hole_diameter ?? holeDiameter,
+      viaOuterDiameter: pcbBoard?.min_via_pad_diameter ?? padDiameter,
+      viaStitchPitch: boardComponent?._parsedProps.viaStitchPitch
+    }
+  };
+  const solver = new ViaStitchSolver(solverInput);
+  subcircuit.root.emit("solver:started", {
+    type: "solver:started",
+    solverName: "ViaStitchSolver",
+    solverParams: solverInput,
+    solverConstructorArgs: [solverInput],
+    componentName: subcircuit.getString()
+  });
+  solver.solve();
+  if (solver.failed) {
+    throw new Error(solver.error ?? "Via stitching solver failed");
+  }
+  for (const pcbVia of solver.getOutput().pcbVias) {
+    const { pcb_via_id: _solverViaId, ...pcbViaInput } = pcb_via3.parse(pcbVia);
+    const insertedVia = db.pcb_via.insert({
+      ...pcbViaInput,
+      tented_on_top: void 0,
+      tented_on_bottom: void 0
+    });
+    boardComponent?._generatedStitchingViaIds?.add(insertedVia.pcb_via_id);
+  }
+};
+function CopperPour_doInitialPcbViaStitchRender(copperPour) {
+  if (copperPour.root?.pcbDisabled || !copperPour.root?._featurePcbViaStitching)
+    return;
+  if (!copperPour._getBoard()?._parsedProps.enableViaStitching) return;
+  copperPour._queueAsyncEffect("PcbViaStitchRender", async () => {
+    renderViaStitchingForCopperPours(copperPour);
+  });
+}
+
+// lib/components/primitive-components/CopperPour/CopperPour.ts
+var CopperPour = class extends PrimitiveComponent2 {
+  isPcbPrimitive = true;
+  _isImplicitCopperPour = false;
+  get config() {
+    return {
+      componentName: "CopperPour",
+      zodProps: copperPourProps
+    };
+  }
+  getPcbSize() {
+    return { width: 0, height: 0 };
+  }
+  doInitialCreateNetsFromProps() {
+    const { _parsedProps: props } = this;
+    createNetsFromProps(this, [props.connectsTo]);
+  }
+  doInitialPcbCopperPourRender() {
+    CopperPour_doInitialPcbCopperPourRender(this);
+  }
+  doInitialPcbViaStitchRender() {
+    CopperPour_doInitialPcbViaStitchRender(this);
+  }
+};
+
 // lib/components/primitive-components/AssemblyDevice.ts
 import { assemblyDeviceProps } from "@tscircuit/props";
 import { identity as identity10 } from "transformation-matrix";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1967",
+  "version": "0.0.1969",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -40,7 +40,7 @@
     "@tscircuit/checks": "^0.0.208",
     "@tscircuit/circuit-json-util": "^0.0.116",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.56",
+    "@tscircuit/copper-pour-solver": "^0.0.57",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
     "@tscircuit/fanout-solver": "0.0.78",
     "@tscircuit/footprinter": "^0.0.426",