@tscircuit/core 0.0.275 → 0.0.276

package/dist/index.d.ts

@@ -168,6 +168,12 @@ declare const Circuit: typeof RootCircuit;
 interface ISubcircuit extends PrimitiveComponent {
     _shouldUseTraceByTraceRouting(): boolean;
     _parsedProps: z.infer<typeof subcircuitGroupProps>;
+    subcircuit_id: string | null;
+}
+
+interface IGroup extends PrimitiveComponent {
+    source_group_id: string | null;
+    pcb_group_id: string | null;
 }
 
 interface BaseComponentConfig {
@@ -327,6 +333,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     };
     doesSelectorMatch(selector: string): boolean;
     getSubcircuit(): ISubcircuit;
+    getGroup(): IGroup | null;
     selectAll(selector: string): PrimitiveComponent[];
     selectOne<T = PrimitiveComponent>(selector: string, options?: {
         type?: string;
@@ -919,7 +926,8 @@ interface SimpleRouteJson {
 }
 
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> implements ISubcircuit {
-    subcircuit_id?: string;
+    pcb_group_id: string | null;
+    subcircuit_id: string | null;
     _asyncAutoroutingResult: {
         output_simple_route_json?: SimpleRouteJson;
         output_pcb_traces?: PcbTrace[];

package/dist/index.js

@@ -525,6 +525,9 @@ var underscorifyPortArrangement = (portArrangement) => {
   return void 0;
 };
 
+// lib/components/base-components/PrimitiveComponent.ts
+import Debug2 from "debug";
+
 // lib/errors/InvalidProps.ts
 var InvalidProps = class extends Error {
   constructor(componentName, originalProps, formattedError) {
@@ -592,7 +595,6 @@ import {
   translate
 } from "transformation-matrix";
 import { z as z2 } from "zod";
-import Debug2 from "debug";
 var debugSelectAll = Debug2("tscircuit:primitive-component:selectAll");
 var PrimitiveComponent = class extends Renderable {
   parent = null;
@@ -989,6 +991,10 @@ var PrimitiveComponent = class extends Renderable {
       throw new Error("Component is not inside an opaque group (no board?)");
     return group;
   }
+  getGroup() {
+    if (this.isGroup) return this;
+    return this.parent?.getGroup?.() ?? null;
+  }
   selectAll(selector) {
     debugSelectAll(`selectAll: "${selector}"`);
     const parts = selector.trim().split(/\s+/);
@@ -1327,9 +1333,7 @@ var createNetsFromProps = (component, props) => {
 
 // lib/components/primitive-components/SmtPad.ts
 import { smtPadProps } from "@tscircuit/props";
-import {
-  decomposeTSR
-} from "transformation-matrix";
+import { decomposeTSR } from "transformation-matrix";
 var SmtPad = class extends PrimitiveComponent {
   pcb_smtpad_id = null;
   matchedPort = null;
@@ -1373,6 +1377,7 @@ var SmtPad = class extends PrimitiveComponent {
     const { _parsedProps: props } = this;
     if (!props.portHints) return;
     const container = this.getPrimitiveContainer();
+    const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
     const containerCenter = container?._getGlobalPcbPositionBeforeLayout();
     const decomposedMat = decomposeTSR(
@@ -1394,7 +1399,8 @@ var SmtPad = class extends PrimitiveComponent {
         radius: props.radius,
         port_hints: props.portHints.map((ph) => ph.toString()),
         x: position.x,
-        y: position.y
+        y: position.y,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0
       });
       db.pcb_solder_paste.insert({
         layer: pcb_smtpad.layer,
@@ -1404,7 +1410,9 @@ var SmtPad = class extends PrimitiveComponent {
         x: pcb_smtpad.x,
         y: pcb_smtpad.y,
         pcb_component_id: pcb_smtpad.pcb_component_id,
-        pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id
+        pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
     } else if (props.shape === "rect") {
       pcb_smtpad = parentRotation === 0 || isRotated90 ? db.pcb_smtpad.insert({
@@ -1419,7 +1427,9 @@ var SmtPad = class extends PrimitiveComponent {
         },
         port_hints: props.portHints.map((ph) => ph.toString()),
         x: position.x,
-        y: position.y
+        y: position.y,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       }) : db.pcb_smtpad.insert({
         pcb_component_id,
         layer: props.layer ?? "top",
@@ -1428,7 +1438,9 @@ var SmtPad = class extends PrimitiveComponent {
         x: position.x,
         y: position.y,
         ccw_rotation: parentRotation,
-        port_hints: props.portHints.map((ph) => ph.toString())
+        port_hints: props.portHints.map((ph) => ph.toString()),
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
       if (pcb_smtpad.shape === "rect")
         db.pcb_solder_paste.insert({
@@ -1440,7 +1452,9 @@ var SmtPad = class extends PrimitiveComponent {
           x: pcb_smtpad.x,
           y: pcb_smtpad.y,
           pcb_component_id: pcb_smtpad.pcb_component_id,
-          pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id
+          pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+          subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+          pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
         });
     }
     if (pcb_smtpad) {
@@ -1524,7 +1538,7 @@ var SmtPad = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenPath.ts
 import { silkscreenPathProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint2 } from "transformation-matrix";
 var SilkscreenPath = class extends PrimitiveComponent {
   pcb_silkscreen_path_id = null;
   get config() {
@@ -1544,11 +1558,12 @@ var SilkscreenPath = class extends PrimitiveComponent {
       );
     }
     const transform = this._computePcbGlobalTransformBeforeLayout();
+    const subcircuit = this.getSubcircuit();
     const pcb_silkscreen_path = db.pcb_silkscreen_path.insert({
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint3(transform, {
+        const transformedPosition = applyToPoint2(transform, {
           x: p.x,
           y: p.y
         });
@@ -1558,7 +1573,9 @@ var SilkscreenPath = class extends PrimitiveComponent {
           y: transformedPosition.y
         };
       }),
-      stroke_width: props.strokeWidth ?? 0.1
+      stroke_width: props.strokeWidth ?? 0.1,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_silkscreen_path_id = pcb_silkscreen_path.pcb_silkscreen_path_id;
   }
@@ -1636,6 +1653,7 @@ var PlatedHole = class extends PrimitiveComponent {
     const { _parsedProps: props } = this;
     const position = this._getGlobalPcbPositionBeforeLayout();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
+    const subcircuit = this.getSubcircuit();
     if (props.shape === "circle") {
       const pcb_plated_hole = db.pcb_plated_hole.insert({
         pcb_component_id,
@@ -1647,7 +1665,9 @@ var PlatedHole = class extends PrimitiveComponent {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"]
+        layers: ["top", "bottom"],
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
       this.pcb_plated_hole_id = pcb_plated_hole.pcb_plated_hole_id;
     } else if (props.shape === "pill" || props.shape === "oval") {
@@ -1662,7 +1682,9 @@ var PlatedHole = class extends PrimitiveComponent {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"]
+        layers: ["top", "bottom"],
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
         // NOTE: currently PcbPlatedHoleOval erroneously includes both the shape "pill" and "oval"
       });
       this.pcb_plated_hole_id = pcb_plated_hole.pcb_plated_hole_id;
@@ -1691,6 +1713,7 @@ var Keepout = class extends PrimitiveComponent {
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
+    const subcircuit = this.getSubcircuit();
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const position = this._getGlobalPcbPositionBeforeLayout();
@@ -1708,7 +1731,9 @@ var Keepout = class extends PrimitiveComponent {
         center: {
           x: position.x,
           y: position.y
-        }
+        },
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: subcircuit?.getGroup()?.pcb_group_id ?? void 0
       });
     } else if (props.shape === "rect") {
       pcb_keepout = db.pcb_keepout.insert({
@@ -1719,7 +1744,9 @@ var Keepout = class extends PrimitiveComponent {
         center: {
           x: position.x,
           y: position.y
-        }
+        },
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: subcircuit?.getGroup()?.pcb_group_id ?? void 0
       });
     }
     if (pcb_keepout) {
@@ -1747,13 +1774,16 @@ var Hole = class extends PrimitiveComponent {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
     const inserted_hole = db.pcb_hole.insert({
       hole_shape: "circle",
       // @ts-ignore
       hole_diameter: props.diameter,
       x: position.x,
-      y: position.y
+      y: position.y,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: subcircuit?.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_hole_id = inserted_hole.pcb_hole_id;
   }
@@ -1910,7 +1940,7 @@ function getRelativeDirection(pointA, pointB) {
 
 // lib/components/primitive-components/Port/Port.ts
 import "schematic-symbols";
-import { applyToPoint as applyToPoint4, compose as compose3, translate as translate3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint3, compose as compose2, translate as translate2 } from "transformation-matrix";
 import { z as z4 } from "zod";
 
 // lib/components/primitive-components/Port/areAllPcbPrimitivesOverlapping.ts
@@ -2020,11 +2050,11 @@ var Port = class extends PrimitiveComponent {
   _getGlobalSchematicPositionBeforeLayout() {
     const symbol = this.parent?.getSchematicSymbol();
     if (symbol && this.schematicSymbolPortDef) {
-      const transform = compose3(
+      const transform = compose2(
         this.parent.computeSchematicGlobalTransform(),
-        translate3(-symbol.center.x, -symbol.center.y)
+        translate2(-symbol.center.x, -symbol.center.y)
       );
-      return applyToPoint4(transform, this.schematicSymbolPortDef);
+      return applyToPoint3(transform, this.schematicSymbolPortDef);
     }
     const parentBoxDim = this?.parent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== void 0) {
@@ -2034,7 +2064,7 @@ var Port = class extends PrimitiveComponent {
       if (!localPortPosition) {
         return { x: 0, y: 0 };
       }
-      return applyToPoint4(
+      return applyToPoint3(
         this.parent.computeSchematicGlobalTransform(),
         localPortPosition
       );
@@ -2145,9 +2175,12 @@ var Port = class extends PrimitiveComponent {
       matchCenter = getCenterOfPcbPrimitives(pcbMatches);
     }
     if (matchCenter) {
+      const subcircuit = this.getSubcircuit();
       const pcb_port = db.pcb_port.insert({
         pcb_component_id: this.parent?.pcb_component_id,
         layers: this.getAvailablePcbLayers(),
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
         ...matchCenter,
         source_port_id: this.source_port_id
       });
@@ -3457,18 +3490,74 @@ var NormalComponent = class extends PrimitiveComponent {
 
 // lib/components/normal-components/Board.ts
 import { boardProps } from "@tscircuit/props";
-import { identity as identity4 } from "transformation-matrix";
+import { identity as identity3 } from "transformation-matrix";
+
+// lib/components/primitive-components/Group/Group.ts
+import { groupProps } from "@tscircuit/props";
+import * as SAL from "@tscircuit/schematic-autolayout";
+import "circuit-json";
+import { ConnectivityMap } from "circuit-json-to-connectivity-map";
+import Debug5 from "debug";
+
+// lib/utils/autorouting/getSimpleRouteJsonFromTracesAndDb.ts
+import { getObstaclesFromSoup } from "@tscircuit/infgrid-ijump-astar";
+var getSimpleRouteJsonFromTracesAndDb = ({
+  db,
+  traces,
+  minTraceWidth = 0.1
+}) => {
+  const obstacles = getObstaclesFromSoup([
+    ...db.pcb_component.list(),
+    ...db.pcb_smtpad.list(),
+    ...db.pcb_plated_hole.list()
+  ]);
+  const allPoints = obstacles.flatMap((o) => [
+    {
+      x: o.center.x - o.width / 2,
+      y: o.center.y - o.height / 2
+    },
+    {
+      x: o.center.x + o.width / 2,
+      y: o.center.y + o.height / 2
+    }
+  ]);
+  const bounds = {
+    minX: Math.min(...allPoints.map((p) => p.x)) - 1,
+    maxX: Math.max(...allPoints.map((p) => p.x)) + 1,
+    minY: Math.min(...allPoints.map((p) => p.y)) - 1,
+    maxY: Math.max(...allPoints.map((p) => p.y)) + 1
+  };
+  const connections = traces.map((trace) => {
+    const connectedPorts = trace._findConnectedPorts();
+    if (!connectedPorts.allPortsFound || connectedPorts.ports.length < 2)
+      return null;
+    return {
+      name: trace.source_trace_id ?? "",
+      pointsToConnect: connectedPorts.ports.map((port) => {
+        const pos = port._getGlobalPcbPositionBeforeLayout();
+        return {
+          x: pos.x,
+          y: pos.y,
+          layer: port.getAvailablePcbLayers()[0] ?? "top"
+        };
+      })
+    };
+  }).filter((c) => c !== null);
+  return {
+    bounds,
+    obstacles: [],
+    connections,
+    layerCount: 2,
+    minTraceWidth
+  };
+};
 
 // lib/components/primitive-components/Group/Group.ts
-import {
-  groupProps
-} from "@tscircuit/props";
-import "transformation-matrix";
 import "zod";
 
 // lib/components/primitive-components/TraceHint.ts
 import { traceHintProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 var TraceHint = class extends PrimitiveComponent {
   matchedPort = null;
   get config() {
@@ -3508,7 +3597,7 @@ var TraceHint = class extends PrimitiveComponent {
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map(
       (offset) => ({
-        ...applyToPoint5(globalTransform, offset),
+        ...applyToPoint4(globalTransform, offset),
         via: offset.via,
         to_layer: offset.to_layer,
         trace_width: offset.trace_width
@@ -3528,67 +3617,9 @@ var TraceHint = class extends PrimitiveComponent {
 };
 
 // lib/components/primitive-components/Group/Group.ts
-import * as SAL from "@tscircuit/schematic-autolayout";
-import "@tscircuit/infgrid-ijump-astar";
-import { ConnectivityMap } from "circuit-json-to-connectivity-map";
-
-// lib/utils/autorouting/getSimpleRouteJsonFromTracesAndDb.ts
-import { getObstaclesFromSoup } from "@tscircuit/infgrid-ijump-astar";
-var getSimpleRouteJsonFromTracesAndDb = ({
-  db,
-  traces,
-  minTraceWidth = 0.1
-}) => {
-  const obstacles = getObstaclesFromSoup([
-    ...db.pcb_component.list(),
-    ...db.pcb_smtpad.list(),
-    ...db.pcb_plated_hole.list()
-  ]);
-  const allPoints = obstacles.flatMap((o) => [
-    {
-      x: o.center.x - o.width / 2,
-      y: o.center.y - o.height / 2
-    },
-    {
-      x: o.center.x + o.width / 2,
-      y: o.center.y + o.height / 2
-    }
-  ]);
-  const bounds = {
-    minX: Math.min(...allPoints.map((p) => p.x)) - 1,
-    maxX: Math.max(...allPoints.map((p) => p.x)) + 1,
-    minY: Math.min(...allPoints.map((p) => p.y)) - 1,
-    maxY: Math.max(...allPoints.map((p) => p.y)) + 1
-  };
-  const connections = traces.map((trace) => {
-    const connectedPorts = trace._findConnectedPorts();
-    if (!connectedPorts.allPortsFound || connectedPorts.ports.length < 2)
-      return null;
-    return {
-      name: trace.source_trace_id ?? "",
-      pointsToConnect: connectedPorts.ports.map((port) => {
-        const pos = port._getGlobalPcbPositionBeforeLayout();
-        return {
-          x: pos.x,
-          y: pos.y,
-          layer: port.getAvailablePcbLayers()[0] ?? "top"
-        };
-      })
-    };
-  }).filter((c) => c !== null);
-  return {
-    bounds,
-    obstacles: [],
-    connections,
-    layerCount: 2,
-    minTraceWidth
-  };
-};
-
-// lib/components/primitive-components/Group/Group.ts
-import Debug5 from "debug";
 var Group = class extends NormalComponent {
-  subcircuit_id;
+  pcb_group_id = null;
+  subcircuit_id = null;
   _asyncAutoroutingResult = null;
   get config() {
     return {
@@ -3599,11 +3630,14 @@ var Group = class extends NormalComponent {
   doInitialSourceRender() {
     const { db } = this.root;
     const source_group = db.source_group.insert({
-      name: this._parsedProps.name
-      // TODO add subcircuit_id
+      name: this._parsedProps.name,
+      is_subcircuit: this.isSubcircuit
     });
     this.subcircuit_id = `subcircuit_${source_group.source_group_id}`;
     this.source_group_id = source_group.source_group_id;
+    db.source_group.update(source_group.source_group_id, {
+      subcircuit_id: this.subcircuit_id
+    });
   }
   doInitialPcbComponentRender() {
     if (this.root?.pcbDisabled) return;
@@ -3619,6 +3653,7 @@ var Group = class extends NormalComponent {
       pcb_component_ids: [],
       source_group_id: this.source_group_id
     });
+    this.pcb_group_id = pcb_group.pcb_group_id;
   }
   doInitialCreateTraceHintsFromProps() {
     const { _parsedProps: props } = this;
@@ -3893,7 +3928,7 @@ var Board = class extends Group {
     this.pcb_board_id = null;
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity4();
+    return identity3();
   }
 };
 
@@ -3912,7 +3947,7 @@ var FTYPE = stringProxy;
 // lib/components/primitive-components/Trace/Trace.ts
 import {
   MultilayerIjump,
-  getObstaclesFromSoup as getObstaclesFromSoup3
+  getObstaclesFromSoup as getObstaclesFromSoup2
 } from "@tscircuit/infgrid-ijump-astar";
 import { traceProps } from "@tscircuit/props";
 import "circuit-json";
@@ -4810,7 +4845,9 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     if (cachedRoute) {
       const pcb_trace2 = db.pcb_trace.insert({
         route: cachedRoute.flatMap((trace) => trace.route),
-        source_trace_id: this.source_trace_id
+        source_trace_id: this.source_trace_id,
+        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
       this.pcb_trace_id = pcb_trace2.pcb_trace_id;
       return;
@@ -4914,7 +4951,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       this.root.db.toArray()
     );
     const [obstacles, errGettingObstacles] = tryNow(
-      () => getObstaclesFromSoup3(this.root.db.toArray())
+      () => getObstaclesFromSoup2(this.root.db.toArray())
       // Remove as any when autorouting-dataset gets updated
     );
     if (errGettingObstacles) {
@@ -5694,7 +5731,7 @@ var Constraint2 = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/FabricationNotePath.ts
 import { fabricationNotePathProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 var FabricationNotePath = class extends PrimitiveComponent {
   fabrication_note_path_id = null;
   get config() {
@@ -5706,6 +5743,7 @@ var FabricationNotePath = class extends PrimitiveComponent {
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
+    const subcircuit = this.getSubcircuit();
     const { _parsedProps: props } = this;
     const layer = props.layer ?? "top";
     if (layer !== "top" && layer !== "bottom") {
@@ -5719,7 +5757,7 @@ var FabricationNotePath = class extends PrimitiveComponent {
       layer,
       color: props.color,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint6(transform, {
+        const transformedPosition = applyToPoint5(transform, {
           x: p.x,
           y: p.y
         });
@@ -5729,7 +5767,8 @@ var FabricationNotePath = class extends PrimitiveComponent {
           y: transformedPosition.y
         };
       }),
-      stroke_width: props.strokeWidth ?? 0.1
+      stroke_width: props.strokeWidth ?? 0.1,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0
     });
     this.fabrication_note_path_id = fabrication_note_path.pcb_fabrication_note_path_id;
   }
@@ -5749,6 +5788,7 @@ var FabricationNoteText = class extends PrimitiveComponent {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const container = this.getPrimitiveContainer();
+    const subcircuit = this.getSubcircuit();
     db.pcb_fabrication_note_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
@@ -5760,7 +5800,9 @@ var FabricationNoteText = class extends PrimitiveComponent {
       layer: "top",
       color: props.color,
       text: props.text ?? "",
-      pcb_component_id: container.pcb_component_id
+      pcb_component_id: container.pcb_component_id,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
   }
 };
@@ -5824,6 +5866,7 @@ var SilkscreenCircle = class extends PrimitiveComponent {
       );
     }
     const transform = this._computePcbGlobalTransformBeforeLayout();
+    const subcircuit = this.getSubcircuit();
     const pcb_silkscreen_circle = db.pcb_silkscreen_circle.insert({
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
@@ -5831,7 +5874,9 @@ var SilkscreenCircle = class extends PrimitiveComponent {
         x: props.pcbX ?? 0,
         y: props.pcbY ?? 0
       },
-      radius: props.radius
+      radius: props.radius,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_silkscreen_circle_id = pcb_silkscreen_circle.pcb_silkscreen_circle_id;
   }
@@ -5857,6 +5902,7 @@ var SilkscreenRect = class extends PrimitiveComponent {
         `Invalid layer "${layer}" for SilkscreenRect. Must be "top" or "bottom".`
       );
     }
+    const subcircuit = this.getSubcircuit();
     const pcb_silkscreen_rect = db.pcb_silkscreen_rect.insert({
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
@@ -5865,7 +5911,9 @@ var SilkscreenRect = class extends PrimitiveComponent {
         y: props.pcbY ?? 0
       },
       width: props.width,
-      height: props.height
+      height: props.height,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this?.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_silkscreen_rect_id = pcb_silkscreen_rect.pcb_silkscreen_rect_id;
   }
@@ -5888,6 +5936,7 @@ var SilkscreenText = class extends PrimitiveComponent {
     const container = this.getPrimitiveContainer();
     const position = this._getGlobalPcbPositionBeforeLayout();
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
+    const subcircuit = this.getSubcircuit();
     db.pcb_silkscreen_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
@@ -5899,7 +5948,9 @@ var SilkscreenText = class extends PrimitiveComponent {
       layer: maybeFlipLayer(props.layer ?? "top"),
       text: props.text ?? "",
       ccw_rotation: props.pcbRotation,
-      pcb_component_id: container.pcb_component_id
+      pcb_component_id: container.pcb_component_id,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
   }
   getPcbSize() {
@@ -5932,6 +5983,7 @@ var SilkscreenLine = class extends PrimitiveComponent {
         `Invalid layer "${layer}" for SilkscreenLine. Must be "top" or "bottom".`
       );
     }
+    const subcircuit = this.getSubcircuit();
     const pcb_silkscreen_line = db.pcb_silkscreen_line.insert({
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
@@ -5939,7 +5991,9 @@ var SilkscreenLine = class extends PrimitiveComponent {
       y1: props.y1,
       x2: props.x2,
       y2: props.y2,
-      stroke_width: props.strokeWidth ?? 0.1
+      stroke_width: props.strokeWidth ?? 0.1,
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: subcircuit?.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_silkscreen_line_id = pcb_silkscreen_line.pcb_silkscreen_line_id;
   }
@@ -5992,6 +6046,7 @@ var Via = class extends PrimitiveComponent {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const position = this._getGlobalPcbPositionBeforeLayout();
+    const subcircuit = this.getSubcircuit();
     const pcb_via = db.pcb_via.insert({
       x: position.x,
       y: position.y,
@@ -5999,7 +6054,9 @@ var Via = class extends PrimitiveComponent {
       outer_diameter: props.outerDiameter,
       layers: ["bottom", "top"],
       from_layer: props.fromLayer || "bottom",
-      to_layer: props.toLayer || "top"
+      to_layer: props.toLayer || "top",
+      subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+      pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
     this.pcb_via_id = pcb_via.pcb_via_id;
   }
@@ -6322,7 +6379,7 @@ var Mosfet = class extends NormalComponent {
 // lib/RootCircuit.ts
 import { su } from "@tscircuit/soup-util";
 import { isValidElement as isValidElement2 } from "react";
-import { identity as identity5 } from "transformation-matrix";
+import { identity as identity4 } from "transformation-matrix";
 var RootCircuit = class {
   firstChild = null;
   children;
@@ -6433,10 +6490,10 @@ var RootCircuit = class {
     throw new Error("project.preview is not yet implemented");
   }
   computeSchematicGlobalTransform() {
-    return identity5();
+    return identity4();
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity5();
+    return identity4();
   }
   selectAll(selector) {
     this._guessRootComponent();
@@ -6627,7 +6684,7 @@ var applyEditEventsToManualEditsFile = ({
 };
 
 // lib/utils/autorouting/getSimpleRouteJsonFromCircuitJson.ts
-import { getObstaclesFromSoup as getObstaclesFromSoup4 } from "@tscircuit/infgrid-ijump-astar";
+import { getObstaclesFromSoup as getObstaclesFromSoup3 } from "@tscircuit/infgrid-ijump-astar";
 import { su as su3 } from "@tscircuit/soup-util";
 import { getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson2 } from "circuit-json-to-connectivity-map";
 var getSimpleRouteJsonFromCircuitJson = ({
@@ -6636,7 +6693,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
 }) => {
   const db = su3(circuitJson);
   const connMap = getFullConnectivityMapFromCircuitJson2(circuitJson);
-  const obstacles = getObstaclesFromSoup4(
+  const obstacles = getObstaclesFromSoup3(
     [
       ...db.pcb_component.list(),
       ...db.pcb_smtpad.list(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.275",
+  "version": "0.0.276",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -57,7 +57,7 @@
     "@tscircuit/props": "^0.0.130",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.41",
-    "circuit-json": "^0.0.132",
+    "circuit-json": "^0.0.133",
     "circuit-json-to-connectivity-map": "^0.0.17",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",