@tscircuit/core 0.0.1231 → 0.0.1233

package/dist/index.d.ts

@@ -131,6 +131,10 @@ type SimpleRouteJson = Omit<SimpleRouteJson$1, "connections" | "traces" | "obsta
     defaultObstacleMargin?: number;
     minTraceToPadEdgeClearance?: number;
     minViaEdgeToPadEdgeClearance?: number;
+    minViaHoleEdgeToViaHoleEdgeClearance?: number;
+    minPlatedHoleDrillEdgeToDrillEdgeClearance?: number;
+    minPadEdgeToPadEdgeClearance?: number;
+    minBoardEdgeClearance?: number;
     obstacles: Obstacle[];
     connections: SimpleRouteConnection[];
     bounds: {
@@ -1375,11 +1379,23 @@ declare class Net extends PrimitiveComponent<typeof netProps> {
     renderError(message: Parameters<typeof PrimitiveComponent.prototype.renderError>[0]): void;
 }
 
+interface RoutingPhaseDrcTolerances {
+    minTraceWidth?: number;
+    minViaHoleEdgeToViaHoleEdgeClearance?: number;
+    minPlatedHoleDrillEdgeToDrillEdgeClearance?: number;
+    minTraceToPadEdgeClearance?: number;
+    minPadEdgeToPadEdgeClearance?: number;
+    minBoardEdgeClearance?: number;
+    minViaEdgeToPadEdgeClearance?: number;
+    minViaHoleDiameter?: number;
+    minViaPadDiameter?: number;
+}
 interface RoutingPhasePlan {
     routingPhaseIndex: number | null;
     autorouter?: AutorouterProp;
     reroute?: boolean;
     region?: AutoroutingPhaseProps["region"];
+    drcTolerances?: RoutingPhaseDrcTolerances;
     nets: Net[];
     traces: Trace[];
 }
@@ -66650,7 +66666,6 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>>;
-            footprint: zod.ZodOptional<zod.ZodType<_tscircuit_props.FootprintProp, zod.ZodTypeDef, _tscircuit_props.FootprintProp>>;
             symbol: zod.ZodOptional<zod.ZodType<_tscircuit_props.SymbolProp, zod.ZodTypeDef, _tscircuit_props.SymbolProp>>;
             schStyle: zod.ZodOptional<zod.ZodObject<{
                 defaultPassiveSize: zod.ZodOptional<zod.ZodUnion<[zod.ZodEnum<["xs", "sm", "md"]>, zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>]>>;
@@ -66665,9 +66680,7 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             relative: zod.ZodOptional<zod.ZodBoolean>;
             schRelative: zod.ZodOptional<zod.ZodBoolean>;
             pcbRelative: zod.ZodOptional<zod.ZodBoolean>;
-        } & {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
-        } & {
             key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             displayName: zod.ZodOptional<zod.ZodString>;
@@ -69937,6 +69950,7 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             mfn: zod.ZodOptional<zod.ZodString>;
             manufacturerPartNumber: zod.ZodOptional<zod.ZodString>;
         } & {
+            footprint: zod.ZodType<_tscircuit_props.FootprintProp | undefined, zod.ZodTypeDef, _tscircuit_props.FootprintProp | undefined>;
             resistance: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
             tolerance: zod.ZodOptional<zod.ZodPipeline<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>, zod.ZodNumber>>;
             pullupFor: zod.ZodOptional<zod.ZodString>;
@@ -152702,7 +152716,7 @@ declare const applyEditEvents: ({ circuitJson, editEvents, }: {
 /**
  * This function can only be called in the PcbTraceRender phase or later
  */
-declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_id, minTraceWidth, minTraceToPadEdgeClearance, minViaEdgeToPadEdgeClearance, nominalTraceWidth, subcircuitComponent, }: {
+declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_id, minTraceWidth, minTraceToPadEdgeClearance, minViaEdgeToPadEdgeClearance, minViaHoleEdgeToViaHoleEdgeClearance, minPlatedHoleDrillEdgeToDrillEdgeClearance, minPadEdgeToPadEdgeClearance, minBoardEdgeClearance, minViaHoleDiameter, minViaPadDiameter, nominalTraceWidth, subcircuitComponent, }: {
     db?: CircuitJsonUtilObjects;
     circuitJson?: AnyCircuitElement[];
     subcircuit_id?: string | null;
@@ -152710,6 +152724,12 @@ declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_
     nominalTraceWidth?: number;
     minTraceToPadEdgeClearance?: number;
     minViaEdgeToPadEdgeClearance?: number;
+    minViaHoleEdgeToViaHoleEdgeClearance?: number;
+    minPlatedHoleDrillEdgeToDrillEdgeClearance?: number;
+    minPadEdgeToPadEdgeClearance?: number;
+    minBoardEdgeClearance?: number;
+    minViaHoleDiameter?: number;
+    minViaPadDiameter?: number;
     subcircuitComponent?: {
         selectAll(selector: string): unknown[];
     };

package/dist/index.js

@@ -13950,6 +13950,12 @@ var getSimpleRouteJsonFromCircuitJson = ({
   minTraceWidth,
   minTraceToPadEdgeClearance,
   minViaEdgeToPadEdgeClearance,
+  minViaHoleEdgeToViaHoleEdgeClearance,
+  minPlatedHoleDrillEdgeToDrillEdgeClearance,
+  minPadEdgeToPadEdgeClearance,
+  minBoardEdgeClearance,
+  minViaHoleDiameter,
+  minViaPadDiameter,
   nominalTraceWidth,
   subcircuitComponent
 }) => {
@@ -14291,6 +14297,14 @@ var getSimpleRouteJsonFromCircuitJson = ({
     conn.externallyConnectedPointIds ??= [];
     conn.externallyConnectedPointIds.push([...tracePortIds]);
   }
+  const resolvedMinViaHoleDiameter = minViaHoleDiameter ?? board?.min_via_hole_diameter;
+  const resolvedMinViaPadDiameter = minViaPadDiameter ?? board?.min_via_pad_diameter;
+  const resolvedMinTraceToPadEdgeClearance = minTraceToPadEdgeClearance ?? board?.min_trace_to_pad_edge_clearance;
+  const resolvedMinViaEdgeToPadEdgeClearance = minViaEdgeToPadEdgeClearance ?? board?.min_via_edge_to_pad_edge_clearance;
+  const resolvedMinViaHoleEdgeToViaHoleEdgeClearance = minViaHoleEdgeToViaHoleEdgeClearance ?? board?.min_via_hole_edge_to_via_hole_edge_clearance;
+  const resolvedMinPlatedHoleDrillEdgeToDrillEdgeClearance = minPlatedHoleDrillEdgeToDrillEdgeClearance ?? board?.min_plated_hole_drill_edge_to_drill_edge_clearance;
+  const resolvedMinPadEdgeToPadEdgeClearance = minPadEdgeToPadEdgeClearance ?? board?.min_pad_edge_to_pad_edge_clearance;
+  const resolvedMinBoardEdgeClearance = minBoardEdgeClearance ?? board?.min_board_edge_clearance;
   return {
     simpleRouteJson: {
       bounds,
@@ -14300,13 +14314,17 @@ var getSimpleRouteJsonFromCircuitJson = ({
       // subcircuit
       layerCount: board?.num_layers ?? 2,
       minTraceWidth: minTraceWidth ?? board?.min_trace_width ?? 0.1,
-      minViaDiameter: board?.min_via_pad_diameter,
-      minViaHoleDiameter: board?.min_via_hole_diameter,
-      minViaPadDiameter: board?.min_via_pad_diameter,
-      min_via_hole_diameter: board?.min_via_hole_diameter,
-      min_via_pad_diameter: board?.min_via_pad_diameter,
-      minTraceToPadEdgeClearance: minTraceToPadEdgeClearance ?? board?.min_trace_to_pad_edge_clearance,
-      minViaEdgeToPadEdgeClearance: minViaEdgeToPadEdgeClearance ?? board?.min_via_edge_to_pad_edge_clearance,
+      minViaDiameter: resolvedMinViaPadDiameter,
+      minViaHoleDiameter: resolvedMinViaHoleDiameter,
+      minViaPadDiameter: resolvedMinViaPadDiameter,
+      min_via_hole_diameter: resolvedMinViaHoleDiameter,
+      min_via_pad_diameter: resolvedMinViaPadDiameter,
+      minTraceToPadEdgeClearance: resolvedMinTraceToPadEdgeClearance,
+      minViaEdgeToPadEdgeClearance: resolvedMinViaEdgeToPadEdgeClearance,
+      minViaHoleEdgeToViaHoleEdgeClearance: resolvedMinViaHoleEdgeToViaHoleEdgeClearance,
+      minPlatedHoleDrillEdgeToDrillEdgeClearance: resolvedMinPlatedHoleDrillEdgeToDrillEdgeClearance,
+      minPadEdgeToPadEdgeClearance: resolvedMinPadEdgeToPadEdgeClearance,
+      minBoardEdgeClearance: resolvedMinBoardEdgeClearance,
       nominalTraceWidth,
       outline: board?.outline?.map((point6) => ({ ...point6 }))
     },
@@ -18284,6 +18302,45 @@ function getAutoroutingPhasePropsByPhaseIndex(group) {
   }
   return propsByPhaseIndex;
 }
+function toParsedDistance(value) {
+  if (value === void 0) return void 0;
+  return Number(value);
+}
+function getDrcTolerancesFromAutoroutingPhaseProps(phaseProps) {
+  const {
+    minTraceWidth,
+    minViaHoleEdgeToViaHoleEdgeClearance,
+    minPlatedHoleDrillEdgeToDrillEdgeClearance,
+    minTraceToPadEdgeClearance,
+    minPadEdgeToPadEdgeClearance,
+    minBoardEdgeClearance,
+    minViaEdgeToPadEdgeClearance,
+    minViaHoleDiameter,
+    minViaPadDiameter
+  } = phaseProps;
+  if (minTraceWidth === void 0 && minViaHoleEdgeToViaHoleEdgeClearance === void 0 && minPlatedHoleDrillEdgeToDrillEdgeClearance === void 0 && minTraceToPadEdgeClearance === void 0 && minPadEdgeToPadEdgeClearance === void 0 && minBoardEdgeClearance === void 0 && minViaEdgeToPadEdgeClearance === void 0 && minViaHoleDiameter === void 0 && minViaPadDiameter === void 0) {
+    return void 0;
+  }
+  return {
+    minTraceWidth: toParsedDistance(minTraceWidth),
+    minViaHoleEdgeToViaHoleEdgeClearance: toParsedDistance(
+      minViaHoleEdgeToViaHoleEdgeClearance
+    ),
+    minPlatedHoleDrillEdgeToDrillEdgeClearance: toParsedDistance(
+      minPlatedHoleDrillEdgeToDrillEdgeClearance
+    ),
+    minTraceToPadEdgeClearance: toParsedDistance(minTraceToPadEdgeClearance),
+    minPadEdgeToPadEdgeClearance: toParsedDistance(
+      minPadEdgeToPadEdgeClearance
+    ),
+    minBoardEdgeClearance: toParsedDistance(minBoardEdgeClearance),
+    minViaEdgeToPadEdgeClearance: toParsedDistance(
+      minViaEdgeToPadEdgeClearance
+    ),
+    minViaHoleDiameter: toParsedDistance(minViaHoleDiameter),
+    minViaPadDiameter: toParsedDistance(minViaPadDiameter)
+  };
+}
 function Group_getRoutingPhasePlans(group) {
   const traces = group.selectAll("trace");
   const nets = group.selectAll("net");
@@ -18317,6 +18374,19 @@ function Group_getRoutingPhasePlans(group) {
     const phaseProps = phasePropsByPhaseIndex.get(plan.routingPhaseIndex);
     plan.reroute = phaseProps?.reroute;
     plan.region = phaseProps?.region;
+    plan.drcTolerances = phaseProps ? getDrcTolerancesFromAutoroutingPhaseProps(phaseProps) : void 0;
+  }
+  const defaultPhaseProps = phasePropsByPhaseIndex.get(null);
+  if (phasePropsByPhaseIndex.size === 1 && defaultPhaseProps?.reroute && plans.length === 1 && plans[0]?.routingPhaseIndex === null) {
+    const reroutePlan = plans[0];
+    return [
+      {
+        routingPhaseIndex: null,
+        nets: [...reroutePlan.nets],
+        traces: [...reroutePlan.traces]
+      },
+      reroutePlan
+    ];
   }
   return plans;
 }
@@ -18459,6 +18529,52 @@ function Group_filterSimpleRouteJsonForPhase(simpleRouteJson, phasePlan) {
     connections
   };
 }
+function hasDrcTolerances(drcTolerances) {
+  if (!drcTolerances) return false;
+  return Object.values(drcTolerances).some((value) => value !== void 0);
+}
+function applyMinTraceWidthToConnections(connections, minTraceWidth) {
+  if (minTraceWidth === void 0) return connections;
+  return connections.map((connection) => ({
+    ...connection,
+    nominalTraceWidth: Math.max(
+      connection.nominalTraceWidth ?? minTraceWidth,
+      minTraceWidth
+    ),
+    width: Math.max(connection.width ?? minTraceWidth, minTraceWidth)
+  }));
+}
+function Group_applyDrcTolerancesToSimpleRouteJson(simpleRouteJson, drcTolerances) {
+  if (!hasDrcTolerances(drcTolerances)) return simpleRouteJson;
+  const minTraceWidth = drcTolerances.minTraceWidth ?? simpleRouteJson.minTraceWidth;
+  const minViaHoleDiameter = drcTolerances.minViaHoleDiameter ?? simpleRouteJson.minViaHoleDiameter;
+  const minViaPadDiameter = drcTolerances.minViaPadDiameter ?? simpleRouteJson.minViaPadDiameter;
+  const minTraceToPadEdgeClearance = drcTolerances.minTraceToPadEdgeClearance ?? simpleRouteJson.minTraceToPadEdgeClearance;
+  const minViaEdgeToPadEdgeClearance = drcTolerances.minViaEdgeToPadEdgeClearance ?? simpleRouteJson.minViaEdgeToPadEdgeClearance;
+  const minViaHoleEdgeToViaHoleEdgeClearance = drcTolerances.minViaHoleEdgeToViaHoleEdgeClearance ?? simpleRouteJson.minViaHoleEdgeToViaHoleEdgeClearance;
+  const minPlatedHoleDrillEdgeToDrillEdgeClearance = drcTolerances.minPlatedHoleDrillEdgeToDrillEdgeClearance ?? simpleRouteJson.minPlatedHoleDrillEdgeToDrillEdgeClearance;
+  const minPadEdgeToPadEdgeClearance = drcTolerances.minPadEdgeToPadEdgeClearance ?? simpleRouteJson.minPadEdgeToPadEdgeClearance;
+  const minBoardEdgeClearance = drcTolerances.minBoardEdgeClearance ?? simpleRouteJson.minBoardEdgeClearance;
+  return {
+    ...simpleRouteJson,
+    connections: applyMinTraceWidthToConnections(
+      simpleRouteJson.connections,
+      drcTolerances.minTraceWidth
+    ),
+    minTraceWidth,
+    minViaDiameter: minViaPadDiameter,
+    minViaHoleDiameter,
+    minViaPadDiameter,
+    min_via_hole_diameter: minViaHoleDiameter,
+    min_via_pad_diameter: minViaPadDiameter,
+    minTraceToPadEdgeClearance,
+    minViaEdgeToPadEdgeClearance,
+    minViaHoleEdgeToViaHoleEdgeClearance,
+    minPlatedHoleDrillEdgeToDrillEdgeClearance,
+    minPadEdgeToPadEdgeClearance,
+    minBoardEdgeClearance
+  };
+}
 function Group_getObstaclesFromRoutedTraces(traces) {
   const obstacles = [];
   for (const trace of traces) {
@@ -19315,6 +19431,10 @@ var Group6 = class extends NormalComponent3 {
           ...Group_getObstaclesFromRoutedTraces(outputTraces)
         ];
       }
+      simpleRouteJson = Group_applyDrcTolerancesToSimpleRouteJson(
+        simpleRouteJson,
+        routingPhasePlan.drcTolerances
+      );
       if (hasPhasedAutorouting && simpleRouteJson.connections.length === 0) {
         continue;
       }
@@ -20635,7 +20755,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1230",
+  version: "0.0.1232",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -20681,7 +20801,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.527",
+    "@tscircuit/props": "^0.0.531",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.55",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1231",
+  "version": "0.0.1233",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -47,7 +47,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.527",
+    "@tscircuit/props": "^0.0.531",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.55",
     "@tscircuit/solver-utils": "^0.0.3",