@tscircuit/core 0.0.957 → 0.0.959

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { PackSolver2 } from 'calculate-packing';
-import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2 } from '@tscircuit/capacity-autorouter';
+import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2, AssignableAutoroutingPipeline3 } from '@tscircuit/capacity-autorouter';
 import { CopperPourPipelineSolver } from '@tscircuit/copper-pour-solver';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
@@ -128,6 +128,7 @@ declare const SOLVERS: {
     PackSolver2: typeof PackSolver2;
     AutoroutingPipelineSolver: typeof AutoroutingPipelineSolver;
     AssignableAutoroutingPipeline2: typeof AssignableAutoroutingPipeline2;
+    AssignableAutoroutingPipeline3: typeof AssignableAutoroutingPipeline3;
     CopperPourPipelineSolver: typeof CopperPourPipelineSolver;
 };
 type SolverName = keyof typeof SOLVERS;
@@ -148,6 +149,18 @@ type SimplifiedPcbTrace = {
         y: number;
         to_layer: string;
         from_layer: string;
+    } | {
+        route_type: "jumper";
+        start: {
+            x: number;
+            y: number;
+        };
+        end: {
+            x: number;
+            y: number;
+        };
+        footprint: "0603" | "1206" | "1206x4_pair";
+        layer: string;
     }>;
 };
 type Obstacle = {
@@ -194,6 +207,7 @@ interface SimpleRouteJson {
         y: number;
     }>;
     traces?: SimplifiedPcbTrace[];
+    allowJumpers?: boolean;
 }
 
 type RootCircuitEventName = "asyncEffect:start" | "asyncEffect:end" | "renderable:renderLifecycle:anyEvent" | `renderable:renderLifecycle:${RenderPhase}:start` | `renderable:renderLifecycle:${RenderPhase}:end` | `board:renderPhaseStarted` | "external:evalError" | "autorouting:start" | "autorouting:end" | "autorouting:error" | "autorouting:progress" | "packing:start" | "packing:end" | "packing:error" | "solver:started" | "renderComplete" | "debug:logOutput";
@@ -336,6 +350,7 @@ interface ISubcircuit extends PrimitiveComponent {
     _shouldUseTraceByTraceRouting(): boolean;
     _parsedProps: z.infer<typeof subcircuitGroupProps>;
     _getAutorouterConfig(): AutorouterConfig;
+    _isAutoJumperAutorouter(autorouterConfig?: AutorouterConfig): boolean;
     getNextAvailableName(elm: PrimitiveComponent): string;
     _getSubcircuitLayerCount(): number;
     subcircuit_id: string | null;
@@ -1352,6 +1367,23 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _asyncAutoroutingResult: {
         output_simple_route_json?: SimpleRouteJson;
         output_pcb_traces?: (PcbTrace$1 | PcbVia)[];
+        output_jumpers?: Array<{
+            jumper_footprint: string;
+            center: {
+                x: number;
+                y: number;
+            };
+            orientation: string;
+            pads: Array<{
+                center: {
+                    x: number;
+                    y: number;
+                };
+                width: number;
+                height: number;
+                layer: string;
+            }>;
+        }>;
     } | null;
     get config(): {
         zodProps: Props;
@@ -1362,6 +1394,8 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSourceParentAttachment(): void;
     doInitialPcbComponentRender(): void;
     doInitialPcbPrimitiveRender(): void;
+    calculatePcbGroupBounds(): void;
+    updatePcbPrimitiveRender(): void;
     unnamedElementCounter: Record<string, number>;
     getNextAvailableName(elm: PrimitiveComponent): string;
     _resolvePcbPadding(): {
@@ -1411,6 +1445,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     };
     _getAutorouterConfig(): AutorouterConfig;
     _isLaserPrefabAutorouter(autorouterConfig?: AutorouterConfig): boolean;
+    _isAutoJumperAutorouter(autorouterConfig?: AutorouterConfig): boolean;
     _getSubcircuitLayerCount(): number;
     /**
      * Trace-by-trace autorouting is where each trace routes itself in a well-known

package/dist/index.js

@@ -6742,10 +6742,13 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     }
     const [{ route }] = results;
     edges = [];
-    for (let i = 0; i < route.length - 1; i++) {
+    const wireAndViaRoutes = route.filter(
+      (r) => r.route_type === "wire" || r.route_type === "via"
+    );
+    for (let i = 0; i < wireAndViaRoutes.length - 1; i++) {
       edges.push({
-        from: route[i],
-        to: route[i + 1]
+        from: wireAndViaRoutes[i],
+        to: wireAndViaRoutes[i + 1]
       });
     }
   }
@@ -9708,13 +9711,15 @@ import "@tscircuit/capacity-autorouter";
 import { PackSolver2 } from "calculate-packing";
 import {
   AutoroutingPipelineSolver,
-  AssignableAutoroutingPipeline2
+  AssignableAutoroutingPipeline2,
+  AssignableAutoroutingPipeline3
 } from "@tscircuit/capacity-autorouter";
 import { CopperPourPipelineSolver } from "@tscircuit/copper-pour-solver";
 var SOLVERS = {
   PackSolver2,
   AutoroutingPipelineSolver,
   AssignableAutoroutingPipeline2,
+  AssignableAutoroutingPipeline3,
   CopperPourPipelineSolver
 };
 
@@ -9738,9 +9743,17 @@ var TscircuitAutorouter = class {
       targetMinCapacity,
       stepDelay = 0,
       useAssignableSolver = false,
+      useAutoJumperSolver = false,
       onSolverStarted
     } = options;
-    const solverName = useAssignableSolver ? "AssignableAutoroutingPipeline2" : "AutoroutingPipelineSolver";
+    let solverName;
+    if (useAutoJumperSolver) {
+      solverName = "AssignableAutoroutingPipeline3";
+    } else if (useAssignableSolver) {
+      solverName = "AssignableAutoroutingPipeline2";
+    } else {
+      solverName = "AutoroutingPipelineSolver";
+    }
     const SolverClass = SOLVERS[solverName];
     this.solver = new SolverClass(input, {
       capacityDepth,
@@ -12083,6 +12096,20 @@ function getPresetAutoroutingConfig(autorouterConfig) {
         ...rest
       };
     }
+    case "auto-jumper": {
+      const {
+        preset: _preset,
+        local: _local,
+        groupMode: _groupMode,
+        ...rest
+      } = providedConfig;
+      return {
+        local: true,
+        groupMode: "subcircuit",
+        preset: "auto_jumper",
+        ...rest
+      };
+    }
     default:
       return {
         local: true,
@@ -13974,6 +14001,97 @@ function computeCenterFromAnchorPosition(anchorPosition, ctx) {
   }
 }
 
+// lib/components/primitive-components/Group/insert-autoplaced-jumpers.ts
+function insertAutoplacedJumpers(params) {
+  const { db, output_jumpers, subcircuit_id } = params;
+  for (let jumperIndex = 0; jumperIndex < output_jumpers.length; jumperIndex++) {
+    const jumper = output_jumpers[jumperIndex];
+    const sourceComponent = db.source_component.insert({
+      ftype: "simple_chip",
+      // Use internal naming convention to avoid conflicts with user-specified names
+      name: `__autoplaced_jumper_${jumperIndex}`,
+      supplier_part_numbers: {}
+    });
+    const rotation4 = jumper.orientation === "horizontal" ? 0 : 90;
+    const firstPadLayer = jumper.pads[0]?.layer || jumper.pads[0]?.layers?.[0] || "top";
+    const pcbComponent = db.pcb_component.insert({
+      source_component_id: sourceComponent.source_component_id,
+      center: jumper.center,
+      rotation: rotation4,
+      layer: firstPadLayer,
+      width: jumper.width || 0,
+      height: jumper.height || 0,
+      obstructs_within_bounds: false
+    });
+    for (const pad of jumper.pads) {
+      const padLayer = pad.layer || pad.layers?.[0] || "top";
+      db.pcb_smtpad.insert({
+        pcb_component_id: pcbComponent.pcb_component_id,
+        shape: "rect",
+        x: pad.center.x,
+        y: pad.center.y,
+        width: pad.width,
+        height: pad.height,
+        layer: padLayer
+      });
+    }
+  }
+}
+
+// lib/components/primitive-components/Group/split-pcb-traces-on-jumper-segments.ts
+function splitPcbTracesOnJumperSegments(route) {
+  const jumperRoutes = route.filter(
+    (p) => p.route_type === "jumper"
+  );
+  const wireAndViaRoutes = route.filter((p) => p.route_type !== "jumper");
+  if (jumperRoutes.length === 0) {
+    return null;
+  }
+  const splitRanges = [];
+  for (const jumperRoute of jumperRoutes) {
+    const jumperStart = jumperRoute.start;
+    const jumperEnd = jumperRoute.end;
+    let startIdx = -1;
+    let endIdx = -1;
+    let minStartDist = Infinity;
+    let minEndDist = Infinity;
+    for (let i = 0; i < wireAndViaRoutes.length; i++) {
+      const p = wireAndViaRoutes[i];
+      if (p.route_type !== "wire") continue;
+      const distToStart = Math.hypot(p.x - jumperStart.x, p.y - jumperStart.y);
+      const distToEnd = Math.hypot(p.x - jumperEnd.x, p.y - jumperEnd.y);
+      if (distToStart < minStartDist) {
+        minStartDist = distToStart;
+        startIdx = i;
+      }
+      if (distToEnd < minEndDist) {
+        minEndDist = distToEnd;
+        endIdx = i;
+      }
+    }
+    if (startIdx > endIdx) {
+      ;
+      [startIdx, endIdx] = [endIdx, startIdx];
+    }
+    if (startIdx >= 0 && endIdx >= 0 && startIdx !== endIdx) {
+      splitRanges.push({ startIdx, endIdx });
+    }
+  }
+  splitRanges.sort((a, b) => a.startIdx - b.startIdx);
+  const segments = [];
+  let currentStart = 0;
+  for (const range of splitRanges) {
+    if (currentStart < range.startIdx) {
+      segments.push(wireAndViaRoutes.slice(currentStart, range.startIdx + 1));
+    }
+    currentStart = range.endIdx;
+  }
+  if (currentStart < wireAndViaRoutes.length) {
+    segments.push(wireAndViaRoutes.slice(currentStart));
+  }
+  return segments;
+}
+
 // lib/components/primitive-components/Group/Group.ts
 var Group6 = class extends NormalComponent3 {
   pcb_group_id = null;
@@ -14061,52 +14179,57 @@ var Group6 = class extends NormalComponent3 {
     }
   }
   doInitialPcbPrimitiveRender() {
+    this.calculatePcbGroupBounds();
+  }
+  calculatePcbGroupBounds() {
+    if (!this.pcb_group_id) return;
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const props = this._parsedProps;
     const hasOutline = props.outline && props.outline.length > 0;
-    if (this.pcb_group_id) {
-      const hasExplicitPositioning = this._parsedProps.pcbX !== void 0 || this._parsedProps.pcbY !== void 0;
-      if (hasOutline) {
-        const numericOutline = props.outline.map((point2) => ({
-          x: distance8.parse(point2.x),
-          y: distance8.parse(point2.y)
-        }));
-        const outlineBounds = getBoundsFromPoints3(numericOutline);
-        if (!outlineBounds) return;
-        const centerX2 = (outlineBounds.minX + outlineBounds.maxX) / 2;
-        const centerY2 = (outlineBounds.minY + outlineBounds.maxY) / 2;
-        const center2 = hasExplicitPositioning ? db.pcb_group.get(this.pcb_group_id)?.center ?? {
-          x: centerX2,
-          y: centerY2
-        } : { x: centerX2, y: centerY2 };
-        db.pcb_group.update(this.pcb_group_id, {
-          center: center2
-        });
-        return;
-      }
-      const bounds = getBoundsOfPcbComponents(this.children);
-      let width = bounds.width;
-      let height = bounds.height;
-      let centerX = (bounds.minX + bounds.maxX) / 2;
-      let centerY = (bounds.minY + bounds.maxY) / 2;
-      if (this.isSubcircuit) {
-        const { padLeft, padRight, padTop, padBottom } = this._resolvePcbPadding();
-        width += padLeft + padRight;
-        height += padTop + padBottom;
-        centerX += (padRight - padLeft) / 2;
-        centerY += (padTop - padBottom) / 2;
-      }
-      const center = hasExplicitPositioning ? db.pcb_group.get(this.pcb_group_id)?.center ?? {
-        x: centerX,
-        y: centerY
-      } : { x: centerX, y: centerY };
+    const hasExplicitPositioning = this._parsedProps.pcbX !== void 0 || this._parsedProps.pcbY !== void 0;
+    if (hasOutline) {
+      const numericOutline = props.outline.map((point2) => ({
+        x: distance8.parse(point2.x),
+        y: distance8.parse(point2.y)
+      }));
+      const outlineBounds = getBoundsFromPoints3(numericOutline);
+      if (!outlineBounds) return;
+      const centerX2 = (outlineBounds.minX + outlineBounds.maxX) / 2;
+      const centerY2 = (outlineBounds.minY + outlineBounds.maxY) / 2;
+      const center2 = hasExplicitPositioning ? db.pcb_group.get(this.pcb_group_id)?.center ?? {
+        x: centerX2,
+        y: centerY2
+      } : { x: centerX2, y: centerY2 };
       db.pcb_group.update(this.pcb_group_id, {
-        width: Number(props.width ?? width),
-        height: Number(props.height ?? height),
-        center
+        center: center2
       });
+      return;
     }
+    const bounds = getBoundsOfPcbComponents(this.children);
+    let width = bounds.width;
+    let height = bounds.height;
+    let centerX = (bounds.minX + bounds.maxX) / 2;
+    let centerY = (bounds.minY + bounds.maxY) / 2;
+    if (this.isSubcircuit) {
+      const { padLeft, padRight, padTop, padBottom } = this._resolvePcbPadding();
+      width += padLeft + padRight;
+      height += padTop + padBottom;
+      centerX += (padRight - padLeft) / 2;
+      centerY += (padTop - padBottom) / 2;
+    }
+    const center = hasExplicitPositioning ? db.pcb_group.get(this.pcb_group_id)?.center ?? {
+      x: centerX,
+      y: centerY
+    } : { x: centerX, y: centerY };
+    db.pcb_group.update(this.pcb_group_id, {
+      width: Number(props.width ?? width),
+      height: Number(props.height ?? height),
+      center
+    });
+  }
+  updatePcbPrimitiveRender() {
+    this.calculatePcbGroupBounds();
   }
   unnamedElementCounter = {};
   getNextAvailableName(elm) {
@@ -14304,6 +14427,7 @@ var Group6 = class extends NormalComponent3 {
     debug11(`[${this.getString()}] starting local autorouting`);
     const autorouterConfig = this._getAutorouterConfig();
     const isLaserPrefabPreset = this._isLaserPrefabAutorouter(autorouterConfig);
+    const isAutoJumperPreset = this._isAutoJumperAutorouter(autorouterConfig);
     const isSingleLayerBoard = this._getSubcircuitLayerCount() === 1;
     const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
       db,
@@ -14311,6 +14435,9 @@ var Group6 = class extends NormalComponent3 {
       nominalTraceWidth: this.props.nominalTraceWidth,
       subcircuit_id: this.subcircuit_id
     });
+    if (isAutoJumperPreset) {
+      simpleRouteJson.allowJumpers = true;
+    }
     if (debug11.enabled) {
       ;
       global.debugOutputArray?.push({
@@ -14339,6 +14466,7 @@ var Group6 = class extends NormalComponent3 {
         capacityDepth: this.props.autorouter?.capacityDepth,
         targetMinCapacity: this.props.autorouter?.targetMinCapacity,
         useAssignableSolver: isLaserPrefabPreset || isSingleLayerBoard,
+        useAutoJumperSolver: isAutoJumperPreset,
         onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
           type: "solver:started",
           solverName,
@@ -14380,8 +14508,14 @@ var Group6 = class extends NormalComponent3 {
           subcircuit_id: this.subcircuit_id
         });
       }
+      let outputJumpers = [];
+      const solver = autorouter.solver;
+      if (solver?.getOutputJumpers) {
+        outputJumpers = solver.getOutputJumpers() || [];
+      }
       this._asyncAutoroutingResult = {
-        output_pcb_traces: traces
+        output_pcb_traces: traces,
+        output_jumpers: outputJumpers
       };
       this._markDirty("PcbTraceRender");
     } catch (error) {
@@ -14484,11 +14618,18 @@ var Group6 = class extends NormalComponent3 {
     }
   }
   _updatePcbTraceRenderFromPcbTraces() {
-    const { output_pcb_traces } = this._asyncAutoroutingResult;
+    const { output_pcb_traces, output_jumpers } = this._asyncAutoroutingResult;
     if (!output_pcb_traces) return;
     const { db } = this.root;
     const pcbStyle = this.getInheritedMergedProperty("pcbStyle");
     const { holeDiameter, padDiameter } = getViaDiameterDefaults(pcbStyle);
+    if (output_jumpers && output_jumpers.length > 0) {
+      insertAutoplacedJumpers({
+        db,
+        output_jumpers,
+        subcircuit_id: this.subcircuit_id
+      });
+    }
     for (const pcb_trace of output_pcb_traces) {
       if (pcb_trace.type !== "pcb_trace") continue;
       pcb_trace.subcircuit_id = this.subcircuit_id;
@@ -14496,7 +14637,19 @@ var Group6 = class extends NormalComponent3 {
         const sourceTraceId = pcb_trace.connection_name;
         pcb_trace.source_trace_id = sourceTraceId;
       }
-      db.pcb_trace.insert(pcb_trace);
+      const segments = splitPcbTracesOnJumperSegments(pcb_trace.route);
+      if (segments === null) {
+        db.pcb_trace.insert(pcb_trace);
+        continue;
+      }
+      for (const segment2 of segments) {
+        if (segment2.length > 0) {
+          db.pcb_trace.insert({
+            ...pcb_trace,
+            route: segment2
+          });
+        }
+      }
     }
     for (const pcb_trace of output_pcb_traces) {
       if (pcb_trace.type === "pcb_via") {
@@ -14743,6 +14896,18 @@ var Group6 = class extends NormalComponent3 {
     }
     return false;
   }
+  _isAutoJumperAutorouter(autorouterConfig = this._getAutorouterConfig()) {
+    const autorouterProp = this.props.autorouter;
+    const normalize = (value) => value?.replace(/-/g, "_") ?? value;
+    if (autorouterConfig.preset === "auto_jumper") return true;
+    if (typeof autorouterProp === "string") {
+      return normalize(autorouterProp) === "auto_jumper";
+    }
+    if (typeof autorouterProp === "object" && autorouterProp) {
+      return normalize(autorouterProp.preset) === "auto_jumper";
+    }
+    return false;
+  }
   _getSubcircuitLayerCount() {
     const layers = this.getInheritedProperty("layers");
     return typeof layers === "number" ? layers : 2;
@@ -20371,7 +20536,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.956",
+  version: "0.0.958",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -20402,7 +20567,7 @@ var package_default = {
   devDependencies: {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
-    "@tscircuit/capacity-autorouter": "^0.0.223",
+    "@tscircuit/capacity-autorouter": "^0.0.245",
     "@tscircuit/checks": "^0.0.87",
     "@tscircuit/circuit-json-util": "^0.0.73",
     "@tscircuit/common": "^0.0.20",
@@ -20414,7 +20579,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.440",
+    "@tscircuit/props": "^0.0.441",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.957",
+  "version": "0.0.959",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
-    "@tscircuit/capacity-autorouter": "^0.0.223",
+    "@tscircuit/capacity-autorouter": "^0.0.245",
     "@tscircuit/checks": "^0.0.87",
     "@tscircuit/circuit-json-util": "^0.0.73",
     "@tscircuit/common": "^0.0.20",
@@ -44,7 +44,7 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.440",
+    "@tscircuit/props": "^0.0.441",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",