@tscircuit/core 0.0.1277 → 0.0.1279

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as circuit_json from 'circuit-json';
 import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, PcbViaClearanceError, LayerRef, AnyCircuitElement, Size, PcbTrace as PcbTrace$1, PcbVia as PcbVia$1, PcbTraceRoutePoint, AnySourceComponent, PcbComponent, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
-import { PlatformConfig, traceProps, netProps, AutorouterProp, AutoroutingPhaseProps, subcircuitGroupProps, AutorouterConfig, PcbSx, portProps, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, subcircuitProps, subpanelProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, interconnectProps, solderjumperProps, ledProps, powerSourceProps, voltageSourceProps, currentSourceProps, resistorProps, constraintProps, drcCheckProps, autoroutingPhaseProps, fabricationNoteRectProps, fabricationNotePathProps, fabricationNoteTextProps, fabricationNoteDimensionProps, pcbNoteLineProps, pcbNoteRectProps, pcbNoteTextProps, pcbNotePathProps, pcbNoteDimensionProps, footprintProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, cadmodelProps, cadassemblyProps, platedHoleProps, courtyardCircleProps, courtyardOutlineProps, courtyardRectProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, fiducialProps, traceHintProps, viaProps, copperPourProps, copperTextProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, opampProps, OpAmpPinLabels, switchProps, SwitchProps, testpointProps, schematicTextProps, schematicLineProps, schematicRectProps, schematicArcProps, schematicCircleProps, schematicPathProps, schematicBoxProps, schematicSectionProps, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
+import { PlatformConfig, traceProps, netProps, AutorouterProp, AutoroutingPhaseProps, subcircuitGroupProps, AutorouterConfig, PcbSx, portProps, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, subcircuitProps, subpanelProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, interconnectProps, solderjumperProps, ledProps, powerSourceProps, voltageSourceProps, currentSourceProps, resistorProps, constraintProps, drcCheckProps, autoroutingPhaseProps, fabricationNoteRectProps, fabricationNotePathProps, fabricationNoteTextProps, fabricationNoteDimensionProps, pcbNoteLineProps, pcbNoteRectProps, pcbNoteTextProps, pcbNotePathProps, pcbNoteDimensionProps, footprintProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, cadmodelProps, cadassemblyProps, platedHoleProps, courtyardCircleProps, courtyardOutlineProps, courtyardRectProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, fiducialProps, traceHintProps, viaProps, copperPourProps, copperTextProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, opampProps, OpAmpPinLabels, switchProps, SwitchProps, testpointProps, schematicTextProps, schematicLineProps, schematicRectProps, schematicArcProps, schematicCircleProps, schematicPathProps, schematicBoxProps, schematicSectionProps, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, spicemodelProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
 export { kicadFootprintStrings } from '@tscircuit/props';
 import * as react from 'react';
 import react__default, { ReactElement, DetailedHTMLProps, SVGProps } from 'react';
@@ -2363,6 +2363,13 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialCreateTraceHintsFromProps(): void;
     doInitialSourceAddConnectivityMapKey(): void;
     _areChildSubcircuitsRouted(): boolean;
+    /**
+     * Find subcircuit groups that are direct children of this subcircuit in
+     * the component tree. Unlike selectAll("group"), this walks the children
+     * array directly because the css-select adapter used by selectAll
+     * intentionally skips subcircuit boundaries.
+     */
+    _findDirectChildSubcircuits(): Group[];
     _shouldRouteAsync(): boolean;
     _getRoutingPhasePlans(): RoutingPhasePlan[];
     _hasTracesToRoute(): boolean;
@@ -16210,6 +16217,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             noSchematicRepresentation: z.ZodOptional<z.ZodBoolean>;
             noConnect: z.ZodOptional<z.ZodUnion<[z.ZodReadonly<z.ZodArray<z.ZodString, "many">>, z.ZodArray<z.ZodString, "many">]>>;
             connections: z.ZodOptional<z.ZodPipeline<z.ZodType<Partial<Record<string, string | string[] | readonly string[]>>, z.ZodTypeDef, Partial<Record<string, string | string[] | readonly string[]>>>, z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodReadonly<z.ZodArray<z.ZodString, "many">>]>, z.ZodArray<z.ZodString, "many">]>>>>;
+            spiceModel: z.ZodOptional<z.ZodType<_tscircuit_props.SpiceModelElement, z.ZodTypeDef, _tscircuit_props.SpiceModelElement>>;
         }, "strip", z.ZodTypeAny, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -16864,6 +16872,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -17520,6 +17529,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }>;
         shouldRenderAsSchematicBox: boolean;
     };
@@ -21189,6 +21199,7 @@ declare class Pinout<PinLabels extends string = never> extends Chip<PinLabels> {
             noSchematicRepresentation: z.ZodOptional<z.ZodBoolean>;
             noConnect: z.ZodOptional<z.ZodUnion<[z.ZodReadonly<z.ZodArray<z.ZodString, "many">>, z.ZodArray<z.ZodString, "many">]>>;
             connections: z.ZodOptional<z.ZodPipeline<z.ZodType<Partial<Record<string, string | string[] | readonly string[]>>, z.ZodTypeDef, Partial<Record<string, string | string[] | readonly string[]>>>, z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodReadonly<z.ZodArray<z.ZodString, "many">>]>, z.ZodArray<z.ZodString, "many">]>>>>;
+            spiceModel: z.ZodOptional<z.ZodType<_tscircuit_props.SpiceModelElement, z.ZodTypeDef, _tscircuit_props.SpiceModelElement>>;
         }, "strip", z.ZodTypeAny, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -21843,6 +21854,7 @@ declare class Pinout<PinLabels extends string = never> extends Chip<PinLabels> {
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -22499,6 +22511,7 @@ declare class Pinout<PinLabels extends string = never> extends Chip<PinLabels> {
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }>;
         shouldRenderAsSchematicBox: boolean;
     };
@@ -93593,6 +93606,7 @@ declare class Connector<PinLabels extends string = never> extends Chip<PinLabels
             noSchematicRepresentation: zod.ZodOptional<zod.ZodBoolean>;
             noConnect: zod.ZodOptional<zod.ZodUnion<[zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>, zod.ZodArray<zod.ZodString, "many">]>>;
             connections: zod.ZodOptional<zod.ZodPipeline<zod.ZodType<Partial<Record<string, string | string[] | readonly string[]>>, zod.ZodTypeDef, Partial<Record<string, string | string[] | readonly string[]>>>, zod.ZodRecord<zod.ZodString, zod.ZodUnion<[zod.ZodUnion<[zod.ZodString, zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>]>, zod.ZodArray<zod.ZodString, "many">]>>>>;
+            spiceModel: zod.ZodOptional<zod.ZodType<_tscircuit_props.SpiceModelElement, zod.ZodTypeDef, _tscircuit_props.SpiceModelElement>>;
         } & {
             standard: zod.ZodOptional<zod.ZodEnum<["usb_c", "m2"]>>;
         }, "strip", zod.ZodTypeAny, {
@@ -94249,6 +94263,7 @@ declare class Connector<PinLabels extends string = never> extends Chip<PinLabels
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
             standard?: "usb_c" | "m2" | undefined;
         }, {
             name: string;
@@ -94906,6 +94921,7 @@ declare class Connector<PinLabels extends string = never> extends Chip<PinLabels
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
             standard?: "usb_c" | "m2" | undefined;
         }>;
         shouldRenderAsSchematicBox: boolean;
@@ -116990,6 +117006,7 @@ declare class PushButton extends NormalComponent<typeof pushButtonProps, Passive
             noSchematicRepresentation: zod.ZodOptional<zod.ZodBoolean>;
             noConnect: zod.ZodOptional<zod.ZodUnion<[zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>, zod.ZodArray<zod.ZodString, "many">]>>;
             connections: zod.ZodOptional<zod.ZodPipeline<zod.ZodType<Partial<Record<string, string | string[] | readonly string[]>>, zod.ZodTypeDef, Partial<Record<string, string | string[] | readonly string[]>>>, zod.ZodRecord<zod.ZodString, zod.ZodUnion<[zod.ZodUnion<[zod.ZodString, zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>]>, zod.ZodArray<zod.ZodString, "many">]>>>>;
+            spiceModel: zod.ZodOptional<zod.ZodType<_tscircuit_props.SpiceModelElement, zod.ZodTypeDef, _tscircuit_props.SpiceModelElement>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -117644,6 +117661,7 @@ declare class PushButton extends NormalComponent<typeof pushButtonProps, Passive
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }, {
             name: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -118300,6 +118318,7 @@ declare class PushButton extends NormalComponent<typeof pushButtonProps, Passive
             }[] | undefined;
             noSchematicRepresentation?: boolean | undefined;
             noConnect?: readonly string[] | string[] | undefined;
+            spiceModel?: _tscircuit_props.SpiceModelElement | undefined;
         }>;
         sourceFtype: "simple_push_button";
     };
@@ -126794,7 +126813,7 @@ declare class Transistor extends NormalComponent<typeof transistorProps, Transis
             mfn?: string | undefined;
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
-            connections?: Partial<Record<"pin1" | "pin2" | "pin3" | "emitter" | "collector" | "base" | "gate" | "source" | "drain", string | readonly string[] | string[]>> | undefined;
+            connections?: Partial<Record<"pin1" | "pin2" | "source" | "pin3" | "emitter" | "collector" | "base" | "gate" | "drain", string | readonly string[] | string[]>> | undefined;
         }, {
             type: "npn" | "pnp" | "bjt" | "jfet" | "mosfet" | "igbt";
             name: string;
@@ -127375,7 +127394,7 @@ declare class Transistor extends NormalComponent<typeof transistorProps, Transis
             mfn?: string | undefined;
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
-            connections?: Partial<Record<"pin1" | "pin2" | "pin3" | "emitter" | "collector" | "base" | "gate" | "source" | "drain", string | readonly string[] | string[]>> | undefined;
+            connections?: Partial<Record<"pin1" | "pin2" | "source" | "pin3" | "emitter" | "collector" | "base" | "gate" | "drain", string | readonly string[] | string[]>> | undefined;
         }>;
         sourceFtype: Ftype;
         shouldRenderAsSchematicBox: boolean;
@@ -152442,6 +152461,24 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
     doInitialSchematicReplaceNetLabelsWithSymbols(): void;
 }
 
+declare class SpiceModel extends PrimitiveComponent<typeof spicemodelProps> {
+    get config(): {
+        componentName: string;
+        zodProps: zod.ZodObject<{
+            source: zod.ZodString;
+            spicePinMapping: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodString>>;
+        }, "strip", zod.ZodTypeAny, {
+            source: string;
+            spicePinMapping?: Record<string, string> | undefined;
+        }, {
+            source: string;
+            spicePinMapping?: Record<string, string> | undefined;
+        }>;
+    };
+    doInitialSimulationRender(): void;
+    private _insertSpiceModelError;
+}
+
 declare function resolveStaticFileImport(path: string, platform?: PlatformConfig): Promise<string>;
 
 declare class RootCircuit extends IsolatedCircuit {
@@ -153942,6 +153979,7 @@ interface TscircuitElements {
     voltageprobe: _tscircuit_props.VoltageProbeProps;
     copperpour: _tscircuit_props.CopperPourProps;
     analogsimulation: _tscircuit_props.AnalogSimulationProps;
+    spicemodel: _tscircuit_props.SpiceModelProps;
     fiducial: _tscircuit_props.FiducialProps;
     jscad: any;
 }
@@ -153959,4 +153997,4 @@ declare module "react/jsx-runtime" {
     }
 }
 
-export { AnalogSimulation, type AsyncEffect, type AutorouterCompleteEvent, type AutorouterErrorEvent, type AutorouterEvent, type AutorouterProgressEvent, type AutoroutingEndEvent, type AutoroutingErrorEvent, AutoroutingPhase, type AutoroutingProgressEvent, type AutoroutingStartEvent, Battery, Board, Breakout, BreakoutPoint, CadAssembly, CadModel, Capacitor, Chip, Circuit, type ComponentWithPins, Connector, Constraint, CopperPour, CopperText, CourtyardCircle, CourtyardOutline, CourtyardRect, Crystal, CurrentSource, Cutout, type DebugLogOutputEvent, Diode, DrcCheck, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Breakout as Fanout, BreakoutPoint as FanoutPoint, Fiducial, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IIsolatedCircuit, type IRenderable, type IRootCircuit, Inductor, Interconnect, IsolatedCircuit, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, MountedBoard, Net, NetLabel, NormalComponent, type Obstacle, OpAmp, type PackingEndEvent, type PackingErrorEvent, type PackingStartEvent, Panel, PcbNoteDimension, PcbNoteLine, PcbNotePath, PcbNoteRect, PcbNoteText, PcbTrace, PcbVia, PinHeader, type PinLabelSpec, Pinout, PlatedHole, Port, Potentiometer, PowerSource, PrimitiveComponent, Project, PushButton, type RenderPhase, type RenderPhaseFn, type RenderPhaseFunctions, type RenderPhaseStates, Renderable, Resistor, Resonator, RootCircuit, type RootCircuitEventName, SOLVERS, SchematicArc, SchematicBox, SchematicCell, SchematicCircle, SchematicLine, SchematicPath, SchematicRect, SchematicRow, SchematicSection, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, type SolverName, type SolverStartedEvent, Subcircuit, Subpanel, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, renderPhaseIndexMap, resolveStaticFileImport, sel, unrouteCircuitJson, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };
+export { AnalogSimulation, type AsyncEffect, type AutorouterCompleteEvent, type AutorouterErrorEvent, type AutorouterEvent, type AutorouterProgressEvent, type AutoroutingEndEvent, type AutoroutingErrorEvent, AutoroutingPhase, type AutoroutingProgressEvent, type AutoroutingStartEvent, Battery, Board, Breakout, BreakoutPoint, CadAssembly, CadModel, Capacitor, Chip, Circuit, type ComponentWithPins, Connector, Constraint, CopperPour, CopperText, CourtyardCircle, CourtyardOutline, CourtyardRect, Crystal, CurrentSource, Cutout, type DebugLogOutputEvent, Diode, DrcCheck, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Breakout as Fanout, BreakoutPoint as FanoutPoint, Fiducial, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IIsolatedCircuit, type IRenderable, type IRootCircuit, Inductor, Interconnect, IsolatedCircuit, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, MountedBoard, Net, NetLabel, NormalComponent, type Obstacle, OpAmp, type PackingEndEvent, type PackingErrorEvent, type PackingStartEvent, Panel, PcbNoteDimension, PcbNoteLine, PcbNotePath, PcbNoteRect, PcbNoteText, PcbTrace, PcbVia, PinHeader, type PinLabelSpec, Pinout, PlatedHole, Port, Potentiometer, PowerSource, PrimitiveComponent, Project, PushButton, type RenderPhase, type RenderPhaseFn, type RenderPhaseFunctions, type RenderPhaseStates, Renderable, Resistor, Resonator, RootCircuit, type RootCircuitEventName, SOLVERS, SchematicArc, SchematicBox, SchematicCell, SchematicCircle, SchematicLine, SchematicPath, SchematicRect, SchematicRow, SchematicSection, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, type SolverName, type SolverStartedEvent, SpiceModel, Subcircuit, Subpanel, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, renderPhaseIndexMap, resolveStaticFileImport, sel, unrouteCircuitJson, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };

package/dist/index.js

@@ -88,6 +88,7 @@ __export(components_exports, {
   SilkscreenText: () => SilkscreenText,
   SmtPad: () => SmtPad,
   SolderJumper: () => SolderJumper,
+  SpiceModel: () => SpiceModel,
   Subcircuit: () => Subcircuit,
   Subpanel: () => Subpanel,
   Switch: () => Switch,
@@ -12321,6 +12322,15 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         this.add(cmElm);
       }
     }
+    const spiceModelElm = this.props.spiceModel;
+    if (isValidElement(spiceModelElm)) {
+      const hasSpiceModelChild = this.children.some(
+        (c) => c.componentName === "SpiceModel"
+      );
+      if (!hasSpiceModelChild) {
+        this.add(spiceModelElm);
+      }
+    }
   }
   doInitialPcbFootprintStringRender() {
     NormalComponent_doInitialPcbFootprintStringRender(
@@ -14426,6 +14436,9 @@ var getSimpleRouteJsonFromCircuitJson = ({
   db = su4(subcircuitElements);
   const pcbGroup = subcircuit_id ? db.pcb_group.getWhere({ subcircuit_id }) : void 0;
   const connMap = getFullConnectivityMapFromCircuitJson3(subcircuitElements);
+  const breakoutPoints = db.pcb_breakout_point.list().filter(
+    (bp) => !subcircuit_id || relevantSubcircuitIds?.has(bp.subcircuit_id)
+  );
   const obstacles = getObstaclesFromCircuitJson(
     [
       ...db.pcb_component.list(),
@@ -14435,8 +14448,6 @@ var getSimpleRouteJsonFromCircuitJson = ({
       ...db.pcb_via.list(),
       ...db.pcb_keepout.list(),
       ...db.pcb_cutout.list()
-      // getObstaclesFromSoup is old and doesn't support diagonal traces
-      // ...db.pcb_trace.list(),
     ].filter(
       (e) => !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
     ),
@@ -14450,6 +14461,13 @@ var getSimpleRouteJsonFromCircuitJson = ({
       group: pcbGroup
     })
   );
+  const descendantTraces = subcircuit_id ? db.pcb_trace.list().filter(
+    (t) => t.subcircuit_id && t.subcircuit_id !== subcircuit_id && relevantSubcircuitIds.has(t.subcircuit_id)
+  ).map((t) => ({
+    type: "pcb_trace",
+    pcb_trace_id: t.pcb_trace_id,
+    route: t.route
+  })) : [];
   for (const obstacle of obstacles) {
     const additionalIds = obstacle.connectedTo.flatMap(
       (id) => connMap.getIdsConnectedToNet(id)
@@ -14545,7 +14563,14 @@ var getSimpleRouteJsonFromCircuitJson = ({
   const routedTraceIds = new Set(
     db.pcb_trace.list().map((t) => t.source_trace_id).filter((id) => Boolean(id))
   );
-  const directTraceConnections = db.source_trace.list().filter((trace) => !routedTraceIds.has(trace.source_trace_id)).map((trace) => {
+  const sourcePortIdToBreakoutPoint = /* @__PURE__ */ new Map();
+  for (const bp of breakoutPoints) {
+    const spId = bp.source_port_id;
+    if (spId) sourcePortIdToBreakoutPoint.set(spId, bp);
+  }
+  const directTraceConnections = db.source_trace.list().filter((trace) => !routedTraceIds.has(trace.source_trace_id)).filter(
+    (trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id
+  ).map((trace) => {
     const connectedPorts = trace.connected_source_port_ids.map((id) => {
       const source_port = db.source_port.get(id);
       const pcb_port = db.pcb_port.getWhere({ source_port_id: id });
@@ -14585,33 +14610,39 @@ var getSimpleRouteJsonFromCircuitJson = ({
         });
       }
     }
+    const getPortOrBreakoutPoint = (port, layer, sourcePortId) => {
+      const bp = sourcePortIdToBreakoutPoint.get(sourcePortId);
+      if (bp && bp.subcircuit_id !== subcircuit_id) {
+        return { x: bp.x, y: bp.y, layer };
+      }
+      return {
+        x: port.x,
+        y: port.y,
+        layer,
+        pointId: port.pcb_port_id,
+        pcb_port_id: port.pcb_port_id
+      };
+    };
     return {
       name: trace.source_trace_id ?? connMap.getNetConnectedToId(trace.source_trace_id) ?? "",
       source_trace_id: trace.source_trace_id,
       nominalTraceWidth: trace.min_trace_thickness,
       width: trace.min_trace_thickness,
       pointsToConnect: [
-        {
-          x: portA.x,
-          y: portA.y,
-          layer: layerA,
-          pointId: portA.pcb_port_id,
-          pcb_port_id: portA.pcb_port_id
-        },
+        getPortOrBreakoutPoint(
+          portA,
+          layerA,
+          trace.connected_source_port_ids[0]
+        ),
         ...hintPoints,
-        {
-          x: portB.x,
-          y: portB.y,
-          layer: layerB,
-          pointId: portB.pcb_port_id,
-          pcb_port_id: portB.pcb_port_id
-        }
+        getPortOrBreakoutPoint(
+          portB,
+          layerB,
+          trace.connected_source_port_ids[1]
+        )
       ]
     };
   }).filter((c) => c !== null);
-  const directTraceConnectionsById = new Map(
-    directTraceConnections.map((c) => [c.source_trace_id, c])
-  );
   const source_nets = db.source_net.list().filter(
     (e) => !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
   );
@@ -14644,27 +14675,38 @@ var getSimpleRouteJsonFromCircuitJson = ({
       })
     });
   }
-  const breakoutPoints = db.pcb_breakout_point.list().filter(
-    (bp) => !subcircuit_id || relevantSubcircuitIds?.has(bp.subcircuit_id)
-  );
   const connectionsFromBreakoutPoints = [];
-  const breakoutTraceConnectionsById = /* @__PURE__ */ new Map();
   for (const bp of breakoutPoints) {
+    const bpSourcePortId = bp.source_port_id;
     const pt = { x: bp.x, y: bp.y, layer: "top" };
-    if (bp.source_trace_id) {
-      const conn = directTraceConnectionsById.get(bp.source_trace_id) ?? breakoutTraceConnectionsById.get(bp.source_trace_id);
-      if (conn) {
-        conn.pointsToConnect.push(pt);
-      } else {
-        const newConn = {
-          name: bp.source_trace_id,
-          source_trace_id: bp.source_trace_id,
-          pointsToConnect: [pt]
-        };
-        connectionsFromBreakoutPoints.push(newConn);
-        breakoutTraceConnectionsById.set(bp.source_trace_id, newConn);
+    if (bpSourcePortId) {
+      const pcb_port = db.pcb_port.getWhere({
+        source_port_id: bpSourcePortId
+      });
+      if (!pcb_port) continue;
+      const portPt = {
+        x: pcb_port.x,
+        y: pcb_port.y,
+        layer: pcb_port.layers?.[0] ?? "top",
+        pointId: pcb_port.pcb_port_id,
+        pcb_port_id: pcb_port.pcb_port_id
+      };
+      if (bp.subcircuit_id === subcircuit_id) {
+        connectionsFromBreakoutPoints.push({
+          name: bpSourcePortId,
+          pointsToConnect: [portPt, pt]
+        });
+        continue;
       }
-    } else if (bp.source_net_id) {
+      if (!bp.source_trace_id) {
+        connectionsFromBreakoutPoints.push({
+          name: bpSourcePortId,
+          pointsToConnect: [portPt, pt]
+        });
+      }
+      continue;
+    }
+    if (bp.source_net_id) {
       const conn = connectionsFromNets.find((c) => c.name === bp.source_net_id);
       if (conn) {
         conn.pointsToConnect.push(pt);
@@ -14674,28 +14716,6 @@ var getSimpleRouteJsonFromCircuitJson = ({
           pointsToConnect: [pt]
         });
       }
-    } else if (bp.source_port_id) {
-      const pcb_port = db.pcb_port.getWhere({
-        source_port_id: bp.source_port_id
-      });
-      if (pcb_port) {
-        connectionsFromBreakoutPoints.push({
-          name: bp.source_port_id,
-          // direct connection from port to breakout point
-          source_trace_id: void 0,
-          pointsToConnect: [
-            {
-              x: pcb_port.x,
-              y: pcb_port.y,
-              layer: pcb_port.layers?.[0] ?? "top",
-              pointId: pcb_port.pcb_port_id,
-              // @ts-ignore
-              pcb_port_id: pcb_port.pcb_port_id
-            },
-            pt
-          ]
-        });
-      }
     }
   }
   const allConns = [
@@ -14741,8 +14761,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       bounds,
       obstacles,
       connections: allConns,
-      // TODO add traces so that we don't run into things routed by another
-      // subcircuit
+      traces: descendantTraces.length > 0 ? descendantTraces : void 0,
       layerCount: board?.num_layers ?? 2,
       minTraceWidth: minTraceWidth ?? board?.min_trace_width ?? 0.1,
       minViaDiameter: resolvedMinViaPadDiameter,
@@ -19920,16 +19939,36 @@ var Group5 = class extends NormalComponent3 {
     Group_doInitialSourceAddConnectivityMapKey(this);
   }
   _areChildSubcircuitsRouted() {
-    const subcircuitChildren = this.selectAll("group").filter(
-      (g) => g.isSubcircuit
-    );
+    const subcircuitChildren = this._findDirectChildSubcircuits();
     for (const subcircuitChild of subcircuitChildren) {
+      if (subcircuitChild._isInflatedFromCircuitJson) continue;
+      if (!subcircuitChild._hasTracesToRoute()) continue;
       if (subcircuitChild._shouldRouteAsync() && !subcircuitChild._asyncAutoroutingResult) {
         return false;
       }
     }
     return true;
   }
+  /**
+   * Find subcircuit groups that are direct children of this subcircuit in
+   * the component tree. Unlike selectAll("group"), this walks the children
+   * array directly because the css-select adapter used by selectAll
+   * intentionally skips subcircuit boundaries.
+   */
+  _findDirectChildSubcircuits() {
+    const result = [];
+    const visit = (children) => {
+      for (const child of children) {
+        if (child.isSubcircuit && child !== this) {
+          result.push(child);
+        } else {
+          visit(child.children);
+        }
+      }
+    };
+    visit(this.children);
+    return result;
+  }
   _shouldRouteAsync() {
     const autorouter = this._getAutorouterConfig();
     if (autorouter.groupMode === "sequential-trace") return false;
@@ -21817,7 +21856,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1276",
+  version: "0.0.1278",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21852,7 +21891,7 @@ var package_default = {
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.529",
     "@tscircuit/checks": "0.0.133",
-    "@tscircuit/circuit-json-util": "^0.0.94",
+    "@tscircuit/circuit-json-util": "^0.0.95",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.29",
     "@tscircuit/footprinter": "^0.0.357",
@@ -21865,7 +21904,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.538",
+    "@tscircuit/props": "^0.0.540",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.60",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -21879,12 +21918,12 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.429",
+    "circuit-json": "^0.0.430",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.102",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.34",
+    "circuit-json-to-spice": "^0.0.36",
     "circuit-to-svg": "^0.0.350",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
@@ -21903,6 +21942,7 @@ var package_default = {
     react: "^19.1.0",
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.208",
+    spicets: "^0.0.2",
     spicey: "^0.0.14",
     "stack-svgs": "^0.0.1",
     "ts-expect": "^1.3.0",
@@ -28268,6 +28308,89 @@ var VoltageProbe = class extends PrimitiveComponent2 {
   }
 };
 
+// lib/components/primitive-components/SpiceModel.ts
+import { spicemodelProps } from "@tscircuit/props";
+import { parseSpiceNetlist } from "spicets";
+var SpiceModel = class extends PrimitiveComponent2 {
+  get config() {
+    return {
+      componentName: "SpiceModel",
+      zodProps: spicemodelProps
+    };
+  }
+  doInitialSimulationRender() {
+    const parent = this.parent;
+    if (!parent) return;
+    const parentSourceComponentId = parent.source_component_id;
+    if (!parentSourceComponentId) {
+      this._insertSpiceModelError(
+        "spicemodel must be attached to a source component.",
+        this._parsedProps
+      );
+      return;
+    }
+    const { source, spicePinMapping } = this._parsedProps;
+    const subckt = parseSpiceNetlist(source).subckts[0] ?? null;
+    const spicePinNames = subckt?.pins.map((pin) => pin.name);
+    if (!subckt || !spicePinNames || spicePinNames.length === 0) {
+      this._insertSpiceModelError(
+        "spicemodel source must contain a .subckt declaration with a model name and pins.",
+        source
+      );
+      return;
+    }
+    const mapping = spicePinMapping ?? {};
+    for (const spicePinName of Object.keys(mapping)) {
+      if (!spicePinNames.includes(spicePinName)) {
+        this._insertSpiceModelError(
+          `spicePinMapping references SPICE pin "${spicePinName}", but it is not present in .subckt ${subckt.name}.`,
+          mapping
+        );
+        return;
+      }
+    }
+    const spicePinToSourcePortMap = {};
+    const seenSourcePortIds = /* @__PURE__ */ new Set();
+    for (const spicePinName of spicePinNames) {
+      const componentPinName = mapping[spicePinName] ?? spicePinName;
+      const matchingPorts = parent.selectAll("port").filter(
+        (port) => port instanceof Port && port.isMatchingAnyOf([componentPinName])
+      );
+      if (matchingPorts.length !== 1 || !matchingPorts[0].source_port_id) {
+        this._insertSpiceModelError(
+          `Could not resolve SPICE pin "${spicePinName}" to exactly one component port using "${componentPinName}".`,
+          mapping
+        );
+        return;
+      }
+      const sourcePortId = matchingPorts[0].source_port_id;
+      if (seenSourcePortIds.has(sourcePortId)) {
+        this._insertSpiceModelError(
+          `spicePinMapping maps more than one SPICE pin to component port "${componentPinName}".`,
+          mapping
+        );
+        return;
+      }
+      seenSourcePortIds.add(sourcePortId);
+      spicePinToSourcePortMap[spicePinName] = sourcePortId;
+    }
+    this.root.db.simulation_spice_subcircuit.insert({
+      source_component_id: parentSourceComponentId,
+      spice_pin_to_source_port_map: spicePinToSourcePortMap,
+      subcircuit_source: source
+    });
+  }
+  _insertSpiceModelError(message, propertyValue) {
+    this.root.db.source_invalid_component_property_error.insert({
+      source_component_id: this.parent?.source_component_id || "",
+      property_name: "spiceModel",
+      property_value: propertyValue,
+      message,
+      error_type: "source_invalid_component_property_error"
+    });
+  }
+};
+
 // lib/RootCircuit.ts
 var RootCircuit = class extends IsolatedCircuit {
   isRootCircuit = true;
@@ -28583,6 +28706,7 @@ export {
   SilkscreenText,
   SmtPad,
   SolderJumper,
+  SpiceModel,
   Subcircuit,
   Subpanel,
   Switch,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1277",
+  "version": "0.0.1279",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,7 +36,7 @@
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.529",
     "@tscircuit/checks": "0.0.133",
-    "@tscircuit/circuit-json-util": "^0.0.94",
+    "@tscircuit/circuit-json-util": "^0.0.95",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.29",
     "@tscircuit/footprinter": "^0.0.357",
@@ -49,7 +49,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.538",
+    "@tscircuit/props": "^0.0.540",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.60",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -63,12 +63,12 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.429",
+    "circuit-json": "^0.0.430",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.102",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.34",
+    "circuit-json-to-spice": "^0.0.36",
     "circuit-to-svg": "^0.0.350",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
@@ -87,6 +87,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.208",
+    "spicets": "^0.0.2",
     "spicey": "^0.0.14",
     "stack-svgs": "^0.0.1",
     "ts-expect": "^1.3.0",