@tscircuit/core 0.0.437 → 0.0.438

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { createElement } from 'react';
 import * as zod from 'zod';
 import { z, ZodType } from 'zod';
 import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
-import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTraceRoutePoint, PcbTrace as PcbTrace$1, PcbVia, RouteHintPoint, CircuitJson } from 'circuit-json';
+import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTraceRoutePoint, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import * as _tscircuit_layout from '@tscircuit/layout';
@@ -226,7 +226,7 @@ declare class RootCircuit {
     getCircuitJson(): AnyCircuitElement[];
     toJson(): AnyCircuitElement[];
     getSvg(options: {
-        view: "pcb";
+        view: "pcb" | "schematic";
         layer?: string;
     }): Promise<string>;
     getCoreVersion(): string;
@@ -267,6 +267,7 @@ interface ISubcircuit extends PrimitiveComponent {
 interface IGroup extends PrimitiveComponent {
     source_group_id: string | null;
     pcb_group_id: string | null;
+    _getSchematicLayoutMode(): "match-adapt" | "flex" | "grid" | "none";
 }
 
 type Ftype = Extract<AnySourceComponent, {
@@ -1051,7 +1052,20 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _updatePcbTraceRenderFromSimpleRouteJson(): void;
     _updatePcbTraceRenderFromPcbTraces(): void;
     doInitialSchematicComponentRender(): void;
+    _getSchematicLayoutMode(): "match-adapt" | "flex" | "grid" | "none";
     doInitialSchematicLayout(): void;
+    _doInitialSchematicLayoutMatchAdapt(): void;
+    _doInitialSchematicLayoutGrid(): void;
+    _determineSideFromPosition(port: SchematicPort, component: SchematicComponent): "left" | "right" | "top" | "bottom";
+    _calculateSchematicBounds(boxes: Array<{
+        centerX: number;
+        centerY: number;
+    }>): {
+        minX: number;
+        maxX: number;
+        minY: number;
+        maxY: number;
+    };
     _getAutorouterConfig(): AutorouterConfig;
     /**
      * Trace-by-trace autorouting is where each trace routes itself in a well-known
@@ -1070,6 +1084,7 @@ declare class Board extends Group<typeof boardProps> {
     _drcChecksComplete: boolean;
     _connectedSchematicPortPairs: Set<string>;
     get isSubcircuit(): boolean;
+    get isGroup(): boolean;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{
@@ -13129,7 +13144,7 @@ declare const normalizePinLabels: (inputPinLabels: string[][]) => string[][];
 type Nums16 = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16";
 type Nums40 = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "19" | "20" | "21" | "22" | "23" | "24" | "25" | "26" | "27" | "28" | "29" | "30" | "31" | "32" | "33" | "34" | "35" | "36" | "37" | "38" | "39" | "40";
 type PinNumbers100 = "pin0" | "pin1" | "pin2" | "pin3" | "pin4" | "pin5" | "pin6" | "pin7" | "pin8" | "pin9" | "pin10" | "pin11" | "pin12" | "pin13" | "pin14" | "pin15" | "pin16" | "pin17" | "pin18" | "pin19" | "pin20" | "pin21" | "pin22" | "pin23" | "pin24" | "pin25" | "pin26" | "pin27" | "pin28" | "pin29" | "pin30" | "pin31" | "pin32" | "pin33" | "pin34" | "pin35" | "pin36" | "pin37" | "pin38" | "pin39" | "pin40" | "pin41" | "pin42" | "pin43" | "pin44" | "pin45" | "pin46" | "pin47" | "pin48" | "pin49" | "pin50" | "pin51" | "pin52" | "pin53" | "pin54" | "pin55" | "pin56" | "pin57" | "pin58" | "pin59" | "pin60" | "pin61" | "pin62" | "pin63" | "pin64" | "pin65" | "pin66" | "pin67" | "pin68" | "pin69" | "pin70" | "pin71" | "pin72" | "pin73" | "pin74" | "pin75" | "pin76" | "pin77" | "pin78" | "pin79" | "pin80" | "pin81" | "pin82" | "pin83" | "pin84" | "pin85" | "pin86" | "pin87" | "pin88" | "pin89" | "pin90" | "pin91" | "pin92" | "pin93" | "pin94" | "pin95" | "pin96" | "pin97" | "pin98" | "pin99" | "pin100";
-type CommonPinNames = "pos" | "neg" | "V5" | "V3_3" | "PWR" | "VCC" | "VDD" | "GND" | "SHLD" | `D${Nums40}` | `GP${Nums40}` | `GPIO${Nums40}` | "DP" | "DN" | "VIN" | "VOUT" | "VREF" | "VIN" | "VOUT" | "VREF" | "VUSB" | "VIN" | "VOUT" | "VREF" | "OUT" | "DISCH" | "EN" | "IN" | "CLK" | "DATA" | "THRES" | "TRIG" | "RESET" | "DM" | "DP" | "CC1" | "CC2" | `A${Nums40}` | `B${Nums40}` | PinNumbers100;
+type CommonPinNames = "pos" | "neg" | "V5" | "V3_3" | "PWR" | "VCC" | "VDD" | "GND" | "SHLD" | `D${Nums40}` | `GP${Nums40}` | `GPIO${Nums40}` | "DP" | "DN" | "VIN" | "VOUT" | "VREF" | "VIN" | "VOUT" | "VREF" | "VUSB" | "VIN" | "VOUT" | "VREF" | "OUT" | "DISCH" | "EN" | "IN" | "CLK" | "DATA" | "THRES" | "TRIG" | "RESET" | "DM" | "DP" | "CC1" | "CC2" | "N_CS" | "N_WP" | "N_HOLD" | "SCL" | "SDA" | "MOSI" | "MISO" | "SCK" | "CS" | `A${Nums40}` | `B${Nums40}` | PinNumbers100;
 type TransistorPinNames = "base" | "collector" | "emitter";
 
 type NonPolarizedSel = Record<`R${Nums40}`, {
@@ -13154,7 +13169,7 @@ type PolarizedSel = Record<`C${Nums40}` | `L${Nums40}` | `LED${Nums40}` | `D${Nu
     pos: string;
     neg: string;
 }>;
-type CommonNetNames = "VCC" | "GND" | "VDD" | "PWR" | "V5" | "V3_3" | "VIN" | "SHLD" | "EN";
+type CommonNetNames = "VCC" | "GND" | "VDD" | "PWR" | "V5" | "V3_3" | "VIN" | "SHLD" | "EN" | "SCL" | "SDA" | "MOSI" | "MISO" | "SCK" | "CS" | "FLASH_SDO" | "FLASH_SDI" | "FLASH_SCK" | "FLASH_N_CS" | "FLASH_N_WP" | "FLASH_N_HOLD";
 type TransistorSel = Record<`Q${Nums40}`, Record<TransistorPinNames, string>>;
 type JumperSel = Record<`J${Nums40}` | `CN${Nums40}`, Record<PinNumbers100 | CommonPinNames, string> & ChipFnSel>;
 type ChipSel = Record<`U${Nums40}`, Record<CommonPinNames, string> & ChipFnSel>;

package/dist/index.js

@@ -4898,6 +4898,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
   }
   doInitialSchematicTraceRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getGroup()?._getSchematicLayoutMode() === "match-adapt") return;
     const { db } = this.root;
     const { _parsedProps: props, parent } = this;
     if (!parent) throw new Error("Trace has no parent");
@@ -5909,7 +5910,7 @@ import { identity as identity3 } from "transformation-matrix";
 import {
   groupProps
 } from "@tscircuit/props";
-import * as SAL from "@tscircuit/schematic-autolayout";
+import "@tscircuit/schematic-autolayout";
 
 // lib/utils/autorouting/CapacityMeshAutorouter.ts
 import { CapacityMeshSolver } from "@tscircuit/capacity-autorouter";
@@ -6061,7 +6062,7 @@ var CapacityMeshAutorouter = class {
 
 // lib/components/primitive-components/Group/Group.ts
 import "circuit-json";
-import { ConnectivityMap as ConnectivityMap2 } from "circuit-json-to-connectivity-map";
+import "circuit-json-to-connectivity-map";
 import Debug5 from "debug";
 import "zod";
 
@@ -6592,6 +6593,405 @@ var normalizePinLabels = (inputPinLabels) => {
 
 // lib/components/primitive-components/Group/Group.ts
 import "@tscircuit/checks";
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
+import {
+  SchematicLayoutPipelineSolver,
+  reorderChipPinsToCcw,
+  convertCircuitJsonToInputNetlist,
+  getRefKey as getRefKey2
+} from "@tscircuit/schematic-match-adapt";
+
+// lib/utils/schematic/deriveSourceTraceIdFromMatchAdaptPath.ts
+import {
+  getRefKey,
+  parseRefKey
+} from "@tscircuit/schematic-match-adapt";
+function getConnectivityNetIdFromPortRef(pref, db) {
+  if ("boxId" in pref) {
+    const { boxId: sourceComponentName, pinNumber } = pref;
+    const sourceComp = db.source_component.getWhere({
+      name: sourceComponentName
+    });
+    if (!sourceComp) {
+      throw new Error(
+        `Source component "${sourceComponentName}" not found, but returned from match-adapt ${JSON.stringify(pref)}`
+      );
+    }
+    const sourcePort = db.source_port.getWhere({
+      source_component_id: sourceComp.source_component_id,
+      pin_number: pinNumber
+    });
+    return {
+      subcircuit_connectivity_map_key: sourcePort?.subcircuit_connectivity_map_key ?? null,
+      source_port_id: sourcePort.source_port_id
+    };
+  }
+  if ("netId" in pref) {
+    const { netId: sourceNetName } = pref;
+    const sourceNet = db.source_net.getWhere({ name: sourceNetName });
+    return null;
+  }
+  if ("junctionId" in pref) {
+    const { junctionId } = pref;
+    return null;
+  }
+  return null;
+}
+function deriveSourceTraceIdFromMatchAdaptPath({
+  path,
+  db,
+  layoutConnMap
+}) {
+  let bestRef = getConnectivityNetIdFromPortRef(path.to, db) ?? getConnectivityNetIdFromPortRef(path.from, db);
+  if (!bestRef) {
+    const layoutConnNetId = layoutConnMap.getNetConnectedToId(
+      getRefKey(path.to)
+    );
+    const layoutConnectedRefs = layoutConnMap.getIdsConnectedToNet(layoutConnNetId).map((prefStr) => parseRefKey(prefStr));
+    bestRef = layoutConnectedRefs.map((ref) => getConnectivityNetIdFromPortRef(ref, db)).find(Boolean);
+  }
+  if (!bestRef?.subcircuit_connectivity_map_key) {
+    throw new Error(
+      `No connectivity net id found for match-adapt path ${JSON.stringify(path)}`
+    );
+  }
+  const sourceTraces = db.source_trace.list({
+    subcircuit_connectivity_map_key: bestRef.subcircuit_connectivity_map_key
+  });
+  for (const sourceTrace of sourceTraces) {
+    if (sourceTrace.connected_source_port_ids.includes(bestRef.source_port_id)) {
+      return sourceTrace.source_trace_id;
+    }
+  }
+  if (sourceTraces.length > 0) {
+    return sourceTraces[0].source_trace_id;
+  }
+  throw new Error(
+    `No source trace found for match-adapt path "${JSON.stringify(path)}"`
+  );
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchAdapt.ts
+import { cju } from "@tscircuit/circuit-json-util";
+import { ConnectivityMap as ConnectivityMap2 } from "circuit-json-to-connectivity-map";
+function Group_doInitialSchematicLayoutMatchAdapt(group) {
+  const { db } = group.root;
+  let subtreeCircuitJson = structuredClone(db.toArray());
+  subtreeCircuitJson = reorderChipPinsToCcw(subtreeCircuitJson);
+  const inputNetlist = convertCircuitJsonToInputNetlist(subtreeCircuitJson);
+  const solver = new SchematicLayoutPipelineSolver({
+    inputNetlist
+  });
+  let solvedLayout = null;
+  try {
+    solver.solve();
+    solvedLayout = solver.getLayout();
+  } catch (e) {
+    db.schematic_layout_error.insert({
+      message: `Match-adapt layout failed: ${e.toString()}`,
+      source_group_id: group.source_group_id,
+      schematic_group_id: group.schematic_group_id
+    });
+    return;
+  }
+  const { boxes, junctions, netLabels, paths } = solvedLayout;
+  const layoutConnMap = new ConnectivityMap2({});
+  for (const path of paths) {
+    layoutConnMap.addConnections([[getRefKey2(path.from), getRefKey2(path.to)]]);
+  }
+  for (const junction of junctions) {
+    for (const path of paths) {
+      for (const pathPoint of path.points) {
+        if (Math.abs(pathPoint.x - junction.x) < 1e-3 && Math.abs(pathPoint.y - junction.y) < 1e-3) {
+          layoutConnMap.addConnections([
+            [getRefKey2(path.from), getRefKey2(junction)],
+            [getRefKey2(path.to), getRefKey2(junction)]
+          ]);
+        }
+      }
+    }
+  }
+  for (const box of boxes) {
+    const srcComp = db.source_component.list().find((c) => c.name === box.boxId);
+    if (!srcComp) continue;
+    const schComp = db.schematic_component.getWhere({
+      source_component_id: srcComp.source_component_id
+    });
+    if (!schComp) continue;
+    const schCompMoveDelta = {
+      x: box.centerX - schComp.center.x + 0.1,
+      // TODO figure out why +0.1
+      y: box.centerY - schComp.center.y - 0.1
+    };
+    db.schematic_component.update(schComp.schematic_component_id, {
+      center: {
+        x: schComp.center.x + schCompMoveDelta.x,
+        y: schComp.center.y + schCompMoveDelta.y
+      }
+    });
+    const schematicPorts = db.schematic_port.list({
+      schematic_component_id: schComp.schematic_component_id
+    });
+    for (const schematicPort of schematicPorts) {
+      db.schematic_port.update(schematicPort.schematic_port_id, {
+        center: {
+          x: schematicPort.center.x + schCompMoveDelta.x,
+          y: schematicPort.center.y + schCompMoveDelta.y
+        }
+      });
+    }
+    const schematicTexts = db.schematic_text.list({
+      schematic_component_id: schComp.schematic_component_id
+    });
+    for (const schematicText of schematicTexts) {
+      db.schematic_text.update(schematicText.schematic_text_id, {
+        position: {
+          x: schematicText.position.x + schCompMoveDelta.x,
+          y: schematicText.position.y + schCompMoveDelta.y
+        }
+      });
+    }
+  }
+  for (const nl of netLabels) {
+    const srcNet = db.source_net.list().find((n) => n.name === nl.netId);
+    db.schematic_net_label.insert({
+      text: nl.netId,
+      source_net_id: srcNet?.source_net_id,
+      anchor_position: { x: nl.x, y: nl.y },
+      center: { x: nl.x, y: nl.y },
+      anchor_side: nl.anchorPosition
+    });
+  }
+  for (const path of paths) {
+    if (!path.points || path.points.length < 2) continue;
+    const sourceTraceId = deriveSourceTraceIdFromMatchAdaptPath({
+      path,
+      db: cju(subtreeCircuitJson),
+      layoutConnMap
+    });
+    let edges = [];
+    for (let i = 0; i < path.points.length - 1; i++) {
+      edges.push({
+        from: {
+          x: path.points[i].x,
+          y: path.points[i].y
+        },
+        to: {
+          x: path.points[i + 1].x,
+          y: path.points[i + 1].y
+        }
+      });
+    }
+    const otherCrossingEdges = getOtherSchematicTraces({
+      db,
+      source_trace_id: sourceTraceId,
+      differentNetOnly: true
+    }).flatMap((t) => t.edges);
+    if (otherCrossingEdges.length > 0) {
+      edges = createSchematicTraceCrossingSegments({
+        edges,
+        otherEdges: otherCrossingEdges
+      });
+    }
+    const junctions2 = createSchematicTraceJunctions({
+      edges,
+      db,
+      source_trace_id: sourceTraceId
+    });
+    db.schematic_trace.insert({
+      source_trace_id: sourceTraceId,
+      edges,
+      junctions: junctions2
+    });
+  }
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSourceAddConnectivityMapKey.ts
+import { ConnectivityMap as ConnectivityMap3 } from "circuit-json-to-connectivity-map";
+function Group_doInitialSourceAddConnectivityMapKey(group) {
+  if (!group.isSubcircuit) return;
+  const { db } = group.root;
+  const traces = group.selectAll("trace");
+  const connMap = new ConnectivityMap3({});
+  connMap.addConnections(
+    traces.map((t) => {
+      const source_trace = db.source_trace.get(
+        t.source_trace_id
+      );
+      if (!source_trace) return null;
+      return [
+        source_trace.source_trace_id,
+        ...source_trace.connected_source_port_ids,
+        ...source_trace.connected_source_net_ids
+      ];
+    }).filter((c) => c !== null)
+  );
+  const { name: subcircuitName } = group._parsedProps;
+  for (const trace of traces) {
+    if (!trace.source_trace_id) continue;
+    const connNetId = connMap.getNetConnectedToId(trace.source_trace_id);
+    if (!connNetId) continue;
+    trace.subcircuit_connectivity_map_key = `${subcircuitName ?? `unnamedsubcircuit${group._renderId}`}_${connNetId}`;
+    db.source_trace.update(trace.source_trace_id, {
+      subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key
+    });
+  }
+  const allSourcePortIds = /* @__PURE__ */ new Set();
+  for (const trace of traces) {
+    if (!trace.source_trace_id) continue;
+    const source_trace = db.source_trace.get(
+      trace.source_trace_id
+    );
+    if (!source_trace) continue;
+    for (const id of source_trace.connected_source_port_ids) {
+      allSourcePortIds.add(id);
+    }
+  }
+  for (const portId of allSourcePortIds) {
+    const connNetId = connMap.getNetConnectedToId(portId);
+    if (!connNetId) continue;
+    const connectivityMapKey = `${subcircuitName ?? `unnamedsubcircuit${group._renderId}`}_${connNetId}`;
+    db.source_port.update(portId, {
+      subcircuit_connectivity_map_key: connectivityMapKey
+    });
+  }
+  const allSourceNetIds = /* @__PURE__ */ new Set();
+  for (const trace of traces) {
+    if (!trace.source_trace_id) continue;
+    const source_trace = db.source_trace.get(
+      trace.source_trace_id
+    );
+    if (!source_trace) continue;
+    for (const source_net_id of source_trace.connected_source_net_ids) {
+      allSourceNetIds.add(source_net_id);
+    }
+  }
+  for (const netId of allSourceNetIds) {
+    const connNetId = connMap.getNetConnectedToId(netId);
+    if (!connNetId) continue;
+    const connectivityMapKey = `${subcircuitName ?? `unnamedsubcircuit${group._renderId}`}_${connNetId}`;
+    db.source_net.update(netId, {
+      subcircuit_connectivity_map_key: connectivityMapKey
+    });
+  }
+}
+
+// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutGrid.ts
+function Group_doInitialSchematicLayoutGrid(group) {
+  const { db } = group.root;
+  const props = group._parsedProps;
+  const schematicChildren = group.children.filter(
+    (child) => child.schematic_component_id
+  );
+  if (schematicChildren.length === 0) return;
+  let maxCellWidth = 0;
+  let maxCellHeight = 0;
+  for (const child of schematicChildren) {
+    const schComp = db.schematic_component.get(child.schematic_component_id);
+    if (schComp?.size) {
+      maxCellWidth = Math.max(maxCellWidth, schComp.size.width);
+      maxCellHeight = Math.max(maxCellHeight, schComp.size.height);
+    }
+  }
+  if (maxCellWidth === 0 && schematicChildren.length > 0) maxCellWidth = 1;
+  if (maxCellHeight === 0 && schematicChildren.length > 0) maxCellHeight = 1;
+  let gridColsOption = props.gridCols;
+  let gridRowsOption = void 0;
+  let gridGapOption = props.gridGap;
+  if (props.schLayout?.grid) {
+    gridColsOption = props.schLayout.grid.cols ?? gridColsOption;
+    gridRowsOption = props.schLayout.grid.rows;
+    gridGapOption = props.schLayout.grid.gap ?? gridGapOption;
+  }
+  let numCols;
+  let numRows;
+  if (gridColsOption !== void 0 && gridRowsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = gridRowsOption;
+  } else if (gridColsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = Math.ceil(schematicChildren.length / numCols);
+  } else if (gridRowsOption !== void 0) {
+    numRows = gridRowsOption;
+    numCols = Math.ceil(schematicChildren.length / numRows);
+  } else {
+    numCols = Math.ceil(Math.sqrt(schematicChildren.length));
+    numRows = Math.ceil(schematicChildren.length / numCols);
+  }
+  if (numCols === 0 && schematicChildren.length > 0) numCols = 1;
+  if (numRows === 0 && schematicChildren.length > 0)
+    numRows = schematicChildren.length;
+  let gridGapX;
+  let gridGapY;
+  if (typeof gridGapOption === "number") {
+    gridGapX = gridGapOption;
+    gridGapY = gridGapOption;
+  } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
+    gridGapX = gridGapOption.x;
+    gridGapY = gridGapOption.y;
+  } else {
+    gridGapX = 1;
+    gridGapY = 1;
+  }
+  const totalGridWidth = numCols * maxCellWidth + Math.max(0, numCols - 1) * gridGapX;
+  const totalGridHeight = numRows * maxCellHeight + Math.max(0, numRows - 1) * gridGapY;
+  const groupCenter = group._getGlobalSchematicPositionBeforeLayout();
+  const firstCellCenterX = groupCenter.x - totalGridWidth / 2 + maxCellWidth / 2;
+  const firstCellCenterY = groupCenter.y + totalGridHeight / 2 - maxCellHeight / 2;
+  for (let i = 0; i < schematicChildren.length; i++) {
+    const child = schematicChildren[i];
+    if (!child.schematic_component_id) continue;
+    const row = Math.floor(i / numCols);
+    const col = i % numCols;
+    if (row >= numRows || col >= numCols) {
+      console.warn(
+        `Schematic grid layout: Child ${child.getString()} at index ${i} (row ${row}, col ${col}) exceeds specified grid dimensions (${numRows}x${numCols}). Skipping placement.`
+      );
+      continue;
+    }
+    const targetCellCenterX = firstCellCenterX + col * (maxCellWidth + gridGapX);
+    const targetCellCenterY = firstCellCenterY - row * (maxCellHeight + gridGapY);
+    const schComp = db.schematic_component.get(child.schematic_component_id);
+    if (schComp) {
+      const oldChildCenter = schComp.center;
+      const newChildCenter = { x: targetCellCenterX, y: targetCellCenterY };
+      db.schematic_component.update(child.schematic_component_id, {
+        center: newChildCenter
+      });
+      const deltaX = newChildCenter.x - oldChildCenter.x;
+      const deltaY = newChildCenter.y - oldChildCenter.y;
+      const schPorts = db.schematic_port.list({
+        schematic_component_id: child.schematic_component_id
+      });
+      for (const port of schPorts) {
+        db.schematic_port.update(port.schematic_port_id, {
+          center: { x: port.center.x + deltaX, y: port.center.y + deltaY }
+        });
+      }
+      const schTexts = db.schematic_text.list({
+        schematic_component_id: child.schematic_component_id
+      });
+      for (const text of schTexts) {
+        db.schematic_text.update(text.schematic_text_id, {
+          position: {
+            x: text.position.x + deltaX,
+            y: text.position.y + deltaY
+          }
+        });
+      }
+    }
+  }
+  if (group.schematic_group_id) {
+    db.schematic_group.update(group.schematic_group_id, {
+      width: totalGridWidth,
+      height: totalGridHeight,
+      center: groupCenter
+    });
+  }
+}
+
+// lib/components/primitive-components/Group/Group.ts
 var Group = class extends NormalComponent {
   pcb_group_id = null;
   schematic_group_id = null;
@@ -6683,33 +7083,7 @@ var Group = class extends NormalComponent {
     }
   }
   doInitialSourceAddConnectivityMapKey() {
-    if (!this.isSubcircuit) return;
-    const { db } = this.root;
-    const traces = this.selectAll("trace");
-    const connMap = new ConnectivityMap2({});
-    connMap.addConnections(
-      traces.map((t) => {
-        const source_trace = db.source_trace.get(
-          t.source_trace_id
-        );
-        if (!source_trace) return null;
-        return [
-          source_trace.source_trace_id,
-          ...source_trace.connected_source_port_ids,
-          ...source_trace.connected_source_net_ids
-        ];
-      }).filter((c) => c !== null)
-    );
-    for (const trace of traces) {
-      if (!trace.source_trace_id) continue;
-      const connNetId = connMap.getNetConnectedToId(trace.source_trace_id);
-      if (!connNetId) continue;
-      const { name: subcircuitName } = this._parsedProps;
-      trace.subcircuit_connectivity_map_key = `${subcircuitName ?? `unnamedsubcircuit${this._renderId}`}_${connNetId}`;
-      db.source_trace.update(trace.source_trace_id, {
-        subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key
-      });
-    }
+    Group_doInitialSourceAddConnectivityMapKey(this);
   }
   _areChildSubcircuitsRouted() {
     const subcircuitChildren = this.selectAll("group").filter(
@@ -7055,36 +7429,69 @@ var Group = class extends NormalComponent {
     });
     this.schematic_group_id = schematic_group.schematic_group_id;
     for (const child of this.children) {
-      db.schematic_component.update(child.schematic_component_id, {
-        schematic_group_id: schematic_group.schematic_group_id
-      });
+      if (child.schematic_component_id) {
+        db.schematic_component.update(child.schematic_component_id, {
+          schematic_group_id: schematic_group.schematic_group_id
+        });
+      }
     }
   }
+  _getSchematicLayoutMode() {
+    const props = this._parsedProps;
+    if (props.schLayout?.matchAdapt) return "match-adapt";
+    if (props.schLayout?.flex) return "flex";
+    if (props.schLayout?.grid) return "grid";
+    if (props.matchAdapt) return "match-adapt";
+    if (props.flex) return "flex";
+    if (props.grid) return "grid";
+    return "none";
+  }
   doInitialSchematicLayout() {
-    if (!this.isSubcircuit) return;
     const props = this._parsedProps;
-    if (!props.schAutoLayoutEnabled) return;
-    const { db } = this.root;
-    const descendants = this.getDescendants();
-    const components = [];
-    const ports = [];
-    for (const descendant of descendants) {
-      if ("schematic_component_id" in descendant) {
-        const component = db.schematic_component.get(
-          descendant.schematic_component_id
-        );
-        if (component) {
-          const schPorts = db.schematic_port.list().filter(
-            (p) => p.schematic_component_id === component.schematic_component_id
-          );
-          components.push(component);
-          ports.push(...schPorts);
-        }
-      }
+    const schematicLayoutMode = this._getSchematicLayoutMode();
+    if (schematicLayoutMode === "match-adapt") {
+      this._doInitialSchematicLayoutMatchAdapt();
+    }
+    if (schematicLayoutMode === "grid") {
+      this._doInitialSchematicLayoutGrid();
     }
-    const scene = SAL.convertSoupToScene(db.toArray());
-    const laidOutScene = SAL.ascendingCentralLrBug1(scene);
-    SAL.mutateSoupForScene(db.toArray(), laidOutScene);
+  }
+  _doInitialSchematicLayoutMatchAdapt() {
+    Group_doInitialSchematicLayoutMatchAdapt(this);
+  }
+  _doInitialSchematicLayoutGrid() {
+    Group_doInitialSchematicLayoutGrid(this);
+  }
+  _determineSideFromPosition(port, component) {
+    if (!port.center || !component.center) return "left";
+    const dx = port.center.x - component.center.x;
+    const dy = port.center.y - component.center.y;
+    if (Math.abs(dx) > Math.abs(dy)) {
+      return dx > 0 ? "right" : "left";
+    }
+    return dy > 0 ? "bottom" : "top";
+  }
+  _calculateSchematicBounds(boxes) {
+    if (boxes.length === 0) {
+      return { minX: 0, maxX: 0, minY: 0, maxY: 0 };
+    }
+    let minX = Infinity;
+    let maxX = -Infinity;
+    let minY = Infinity;
+    let maxY = -Infinity;
+    for (const box of boxes) {
+      minX = Math.min(minX, box.centerX);
+      maxX = Math.max(maxX, box.centerX);
+      minY = Math.min(minY, box.centerY);
+      maxY = Math.max(maxY, box.centerY);
+    }
+    const padding = 2;
+    return {
+      minX: minX - padding,
+      maxX: maxX + padding,
+      minY: minY - padding,
+      maxY: maxY + padding
+    };
   }
   _getAutorouterConfig() {
     const defaults = {
@@ -7179,6 +7586,9 @@ var Board = class extends Group {
   get isSubcircuit() {
     return true;
   }
+  get isGroup() {
+    return true;
+  }
   get config() {
     return {
       componentName: "Board",
@@ -8825,7 +9235,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.436",
+  version: "0.0.437",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -8859,6 +9269,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.204",
     "@tscircuit/schematic-autolayout": "^0.0.6",
+    "@tscircuit/schematic-match-adapt": "^0.0.9",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "latest",
     "@types/debug": "^4.1.12",
@@ -8867,7 +9278,7 @@ var package_default = {
     "@types/react-reconciler": "^0.28.9",
     "bun-match-svg": "0.0.8",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.190",
+    "circuit-json": "^0.0.194",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.138",
@@ -8880,7 +9291,7 @@ var package_default = {
     "pkg-pr-new": "^0.0.37",
     react: "^19.0.0",
     "react-dom": "^19.0.0",
-    "schematic-symbols": "^0.0.142",
+    "schematic-symbols": "^0.0.143",
     "ts-expect": "^1.3.0",
     tsup: "^8.2.4"
   },
@@ -8894,6 +9305,7 @@ var package_default = {
     "@tscircuit/math-utils": "*",
     "@tscircuit/props": "*",
     "@tscircuit/schematic-autolayout": "*",
+    "@tscircuit/schematic-match-adapt": "*",
     "circuit-json-to-connectivity-map": "*",
     "circuit-json": "*",
     "schematic-symbols": "*"
@@ -9020,7 +9432,15 @@ var RootCircuit = class {
 "${e.message}"`
       );
     });
-    return circuitToSvg.convertCircuitJsonToPcbSvg(this.getCircuitJson());
+    if (options.view === "pcb") {
+      return circuitToSvg.convertCircuitJsonToPcbSvg(this.getCircuitJson());
+    }
+    if (options.view === "schematic") {
+      return circuitToSvg.convertCircuitJsonToSchematicSvg(
+        this.getCircuitJson()
+      );
+    }
+    throw new Error(`Invalid view: ${options.view}`);
   }
   getCoreVersion() {
     const [major, minor, patch] = package_default.version.split(".").map(Number);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.437",
+  "version": "0.0.438",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -35,6 +35,7 @@
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/props": "^0.0.204",
     "@tscircuit/schematic-autolayout": "^0.0.6",
+    "@tscircuit/schematic-match-adapt": "^0.0.9",
     "@tscircuit/simple-3d-svg": "^0.0.6",
     "@types/bun": "latest",
     "@types/debug": "^4.1.12",
@@ -43,7 +44,7 @@
     "@types/react-reconciler": "^0.28.9",
     "bun-match-svg": "0.0.8",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.190",
+    "circuit-json": "^0.0.194",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.2",
     "circuit-to-svg": "^0.0.138",
@@ -56,7 +57,7 @@
     "pkg-pr-new": "^0.0.37",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "schematic-symbols": "^0.0.142",
+    "schematic-symbols": "^0.0.143",
     "ts-expect": "^1.3.0",
     "tsup": "^8.2.4"
   },
@@ -70,6 +71,7 @@
     "@tscircuit/math-utils": "*",
     "@tscircuit/props": "*",
     "@tscircuit/schematic-autolayout": "*",
+    "@tscircuit/schematic-match-adapt": "*",
     "circuit-json-to-connectivity-map": "*",
     "circuit-json": "*",
     "schematic-symbols": "*"