@tscircuit/core 0.0.1283 → 0.0.1285

package/dist/index.d.ts

@@ -2315,6 +2315,8 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _asyncAutoroutingResult: {
         output_simple_route_json?: SimpleRouteJson;
         output_pcb_traces?: (PcbTrace$1 | PcbVia$1)[];
+        pcb_trace_ids_to_be_replaced?: string[];
+        input_simple_route_json?: SimpleRouteJson;
         output_jumpers?: Array<{
             jumper_footprint: string;
             center: {
@@ -73223,6 +73225,7 @@ declare class BaseBreakoutPoint<TProps extends ZodType = typeof baseBreakoutPoin
     pcb_breakout_point_id: string | null;
     matchedPort: Port | null;
     matchedNet: Net | null;
+    matchedSourceTraceId: string | null;
     isPcbPrimitive: boolean;
     _getSourceTraceIdForPort(port: Port): string | undefined;
     _getSourceNetIdForPort(port: Port): string | undefined;

package/dist/index.js

@@ -14572,7 +14572,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
     };
   }
   const routedTraceIds = new Set(
-    db.pcb_trace.list().map((t) => t.source_trace_id).filter((id) => Boolean(id))
+    db.pcb_trace.list().filter((t) => !subcircuit_id || t.subcircuit_id === subcircuit_id).map((t) => t.source_trace_id).filter((id) => Boolean(id))
   );
   const sourcePortIdToBreakoutPoint = /* @__PURE__ */ new Map();
   for (const bp of breakoutPoints) {
@@ -14705,6 +14705,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       if (bp.subcircuit_id === subcircuit_id) {
         connectionsFromBreakoutPoints.push({
           name: bpSourcePortId,
+          source_trace_id: bp.source_trace_id,
           pointsToConnect: [portPt, pt]
         });
         continue;
@@ -19477,11 +19478,12 @@ function addPossibleReplacementSourceTraceId(sourceTraceIds, value) {
 }
 function deleteExistingPcbTracesReplacedBy({
   group,
-  outputPcbTraces
+  outputPcbTraces,
+  pcbTraceIdsToReplace = []
 }) {
   const db = group.root?.db;
   if (!db) return;
-  const replacementPcbTraceIds = /* @__PURE__ */ new Set();
+  const replacementPcbTraceIds = new Set(pcbTraceIdsToReplace);
   const replacementSourceTraceIds = /* @__PURE__ */ new Set();
   for (const trace of outputPcbTraces) {
     if (trace.type !== "pcb_trace") continue;
@@ -19505,7 +19507,7 @@ function deleteExistingPcbTracesReplacedBy({
   }
   const tracesToDelete = getExistingPcbTracesForReroute(group).filter(
     (trace) => replacementPcbTraceIds.has(trace.pcb_trace_id) || Boolean(
-      trace.source_trace_id && replacementSourceTraceIds.has(trace.source_trace_id)
+      trace.source_trace_id && trace.subcircuit_id === group.subcircuit_id && replacementSourceTraceIds.has(trace.source_trace_id)
     )
   );
   if (tracesToDelete.length === 0) return;
@@ -20157,6 +20159,7 @@ var Group5 = class extends NormalComponent3 {
     const hasPhasedAutorouting = Group_hasPhasedAutorouting(routingPhasePlans);
     const outputTraces = [];
     const outputJumpers = [];
+    const pcbTraceIdsToDelete = /* @__PURE__ */ new Set();
     const existingRerouteSeedTraces = getExistingSimplifiedPcbTracesForReroute(this);
     const traceMatchesRoutingPhase = (trace, routingPhasePlan) => {
       const connectionName = trace.connection_name ?? trace.pcb_trace_id;
@@ -20329,6 +20332,11 @@ var Group5 = class extends NormalComponent3 {
           outputJumpers.push(...solver.getOutputJumpers() || []);
         }
         if (isRegionReroutePhase && rerouteOriginalSrj) {
+          for (const trace of rerouteOriginalSrj.traces ?? []) {
+            if (trace.type === "pcb_trace") {
+              pcbTraceIdsToDelete.add(trace.pcb_trace_id);
+            }
+          }
           const reconnectedSrj = reconnectReroutedSimpleRouteJsonRegion(
             rerouteOriginalSrj,
             {
@@ -20375,7 +20383,9 @@ var Group5 = class extends NormalComponent3 {
     }
     this._asyncAutoroutingResult = {
       output_pcb_traces: outputTraces,
-      output_jumpers: outputJumpers
+      output_jumpers: outputJumpers,
+      pcb_trace_ids_to_be_replaced: [...pcbTraceIdsToDelete],
+      input_simple_route_json: baseSimpleRouteJson
     };
     this._markDirty("PcbTraceRender");
   }
@@ -20474,7 +20484,12 @@ var Group5 = class extends NormalComponent3 {
     }
   }
   _updatePcbTraceRenderFromPcbTraces() {
-    const { output_pcb_traces, output_jumpers } = this._asyncAutoroutingResult;
+    const {
+      output_pcb_traces,
+      output_jumpers,
+      pcb_trace_ids_to_be_replaced,
+      input_simple_route_json
+    } = this._asyncAutoroutingResult;
     if (!output_pcb_traces) return;
     const { db } = this.root;
     const pcbStyle = this.getInheritedMergedProperty("pcbStyle");
@@ -20491,12 +20506,26 @@ var Group5 = class extends NormalComponent3 {
     }
     deleteExistingPcbTracesReplacedBy({
       group: this,
-      outputPcbTraces: output_pcb_traces
-    });
+      outputPcbTraces: output_pcb_traces,
+      pcbTraceIdsToReplace: pcb_trace_ids_to_be_replaced
+    });
+    const sourceTraceIdByConnectionName = /* @__PURE__ */ new Map();
+    for (const connection of input_simple_route_json?.connections ?? []) {
+      if (connection.source_trace_id) {
+        sourceTraceIdByConnectionName.set(
+          connection.name,
+          connection.source_trace_id
+        );
+      }
+    }
     for (const pcb_trace of output_pcb_traces) {
       if (pcb_trace.type !== "pcb_trace") continue;
+      const inputConnectionSourceTraceId = sourceTraceIdByConnectionName.get(
+        pcb_trace.connection_name
+      );
       const possibleSourceTraceIds = [
         ...getSourceTraceIdsFromRerouteName(pcb_trace.source_trace_id),
+        ...inputConnectionSourceTraceId ? [inputConnectionSourceTraceId] : [],
         ...getSourceTraceIdsFromRerouteName(pcb_trace.connection_name),
         ...getSourceTraceIdsFromRerouteName(
           pcb_trace.rootConnectionName
@@ -20515,7 +20544,7 @@ var Group5 = class extends NormalComponent3 {
       } else {
         delete pcb_trace.source_trace_id;
       }
-      pcb_trace.subcircuit_id ??= (sourceTraceId ? db.source_trace.get(sourceTraceId)?.subcircuit_id ?? db.source_net.get(sourceTraceId)?.subcircuit_id : void 0) ?? this.subcircuit_id;
+      pcb_trace.subcircuit_id ??= this.subcircuit_id;
       const cjRoute = pcb_trace.route.map((point6) => {
         if (point6.route_type !== "through_obstacle") return point6;
         return {
@@ -21867,7 +21896,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1282",
+  version: "0.0.1284",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21979,7 +22008,7 @@ var package_default = {
   dependencies: {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-cell-boundaries": "^0.0.1",
+    "calculate-cell-boundaries": "^0.0.8",
     "calculate-packing": "0.0.73",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
@@ -25604,6 +25633,7 @@ var BaseBreakoutPoint = class extends PrimitiveComponent2 {
   pcb_breakout_point_id = null;
   matchedPort = null;
   matchedNet = null;
+  matchedSourceTraceId = null;
   isPcbPrimitive = true;
   _getSourceTraceIdForPort(port) {
     const { db } = this.root;
@@ -25627,7 +25657,7 @@ var BaseBreakoutPoint = class extends PrimitiveComponent2 {
       pcb_group_id: group.pcb_group_id,
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       source_port_id: this.matchedPort?.source_port_id ?? void 0,
-      source_trace_id: this.matchedPort ? this._getSourceTraceIdForPort(this.matchedPort) : void 0,
+      source_trace_id: this.matchedPort ? this.matchedSourceTraceId ?? this._getSourceTraceIdForPort(this.matchedPort) : void 0,
       source_net_id: this.matchedNet ? this.matchedNet.source_net_id : this.matchedPort ? this._getSourceNetIdForPort(this.matchedPort) : void 0,
       x: position.x,
       y: position.y
@@ -25651,10 +25681,14 @@ var BaseBreakoutPoint = class extends PrimitiveComponent2 {
   _setPositionFromLayout(newCenter) {
     const { db } = this.root;
     if (!this.pcb_breakout_point_id) return;
-    db.pcb_breakout_point.update(this.pcb_breakout_point_id, {
+    const updatedProperties = {
       x: newCenter.x,
       y: newCenter.y
-    });
+    };
+    if (this.matchedSourceTraceId) {
+      updatedProperties.source_trace_id = this.matchedSourceTraceId;
+    }
+    db.pcb_breakout_point.update(this.pcb_breakout_point_id, updatedProperties);
   }
   _moveCircuitJsonElements({
     deltaX,
@@ -25859,6 +25893,7 @@ var Breakout = class extends Group5 {
         autoPlacedPorts.add(port);
         const breakoutPoint = new AutoplacedBreakoutPoint({});
         breakoutPoint.matchedPort = port;
+        breakoutPoint.matchedSourceTraceId = trace.source_trace_id;
         this.add(breakoutPoint);
       }
     }
@@ -25878,6 +25913,7 @@ var Breakout = class extends Group5 {
         (child) => child.matchedPort?.source_port_id === solvedPoint.sourcePortId
       );
       if (matchingBreakoutPoint) {
+        matchingBreakoutPoint.matchedSourceTraceId = solvedPoint.sourceTraceId;
         matchingBreakoutPoint._setPositionFromLayout({
           x: solvedPoint.x,
           y: solvedPoint.y
@@ -28433,8 +28469,14 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
     if (sectionData.length === 0) return;
     const allCells = sectionData.map((s) => s.cell);
     const outer = computeBoundsFromCellContents(allCells);
+    const CELL_MARGIN = 1;
     const dividers = calculateCellBoundaries(
-      sectionData.map((s) => s.rawBounds)
+      sectionData.map((s) => ({
+        minX: s.rawBounds.minX - CELL_MARGIN,
+        maxX: s.rawBounds.maxX + CELL_MARGIN,
+        minY: s.rawBounds.minY - CELL_MARGIN,
+        maxY: s.rawBounds.maxY + CELL_MARGIN
+      }))
     );
     for (const line of dividers) {
       db.schematic_line.insert({
@@ -28453,10 +28495,10 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
     const vDividers = dividers.filter(
       (l) => Math.abs(l.start.x - l.end.x) < TOL3
     );
-    for (const { section, cell, rawBounds } of sectionData) {
+    for (const { section, rawBounds } of sectionData) {
       const { displayName, sectionTitleFontSize } = section._parsedProps;
       if (!displayName) continue;
-      const dividersAbove = hDividers.map((l) => l.start.y).filter((y) => y > cell.minY);
+      const dividersAbove = hDividers.map((l) => l.start.y).filter((y) => y > rawBounds.maxY);
       const topBoundary = dividersAbove.length > 0 ? Math.min(...dividersAbove) : outer.maxY;
       const dividersToLeft = vDividers.map((l) => l.start.x).filter((x) => x < rawBounds.minX);
       const leftBoundary = dividersToLeft.length > 0 ? Math.max(...dividersToLeft) : outer.minX;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1283",
+  "version": "0.0.1285",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -113,7 +113,7 @@
   "dependencies": {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-cell-boundaries": "^0.0.1",
+    "calculate-cell-boundaries": "^0.0.8",
     "calculate-packing": "0.0.73",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",