@tscircuit/core 0.0.1242 → 0.0.1243

package/dist/index.js

@@ -4559,6 +4559,13 @@ var findInflatedPcbViaForPoint = (vias, point6) => {
     (via) => Math.abs(via.x - point6.x) < 1e-4 && Math.abs(via.y - point6.y) < 1e-4 && (!via.from_layer || via.from_layer === point6.from_layer) && (!via.to_layer || via.to_layer === point6.to_layer)
   );
 };
+var getViaDiameterFromRoutePoint = (point6) => {
+  const viaPoint = point6;
+  return {
+    holeDiameter: viaPoint.hole_diameter ?? viaPoint.via_hole_diameter,
+    outerDiameter: viaPoint.outer_diameter ?? viaPoint.via_diameter
+  };
+};
 function Trace_doInitialPcbManualTraceRender(trace) {
   if (trace.root?.pcbDisabled) return;
   const { db } = trace.root;
@@ -4652,6 +4659,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
           trace._inflatedPcbVias,
           originalPoint
         );
+        const routePointViaDiameter = getViaDiameterFromRoutePoint(point6);
         const fromLayer = maybeFlipLayer(
           inflatedPcbVia?.from_layer ?? point6.from_layer
         );
@@ -4666,8 +4674,8 @@ function Trace_doInitialPcbManualTraceRender(trace) {
           pcb_trace_id: pcb_trace2.pcb_trace_id,
           x: point6.x,
           y: point6.y,
-          hole_diameter: inflatedPcbVia?.hole_diameter ?? holeDiameter2,
-          outer_diameter: inflatedPcbVia?.outer_diameter ?? padDiameter2,
+          hole_diameter: inflatedPcbVia?.hole_diameter ?? routePointViaDiameter.holeDiameter ?? holeDiameter2,
+          outer_diameter: inflatedPcbVia?.outer_diameter ?? routePointViaDiameter.outerDiameter ?? padDiameter2,
           layers,
           from_layer: fromLayer,
           to_layer: toLayer,
@@ -18542,10 +18550,14 @@ function getDrcTolerancesFromAutoroutingPhaseProps(phaseProps) {
 function Group_getRoutingPhasePlans(group) {
   const traces = group.selectAll("trace");
   const nets = group.selectAll("net");
-  if (traces.length === 0 && nets.length === 0) return [];
   const plansByPhaseIndex = /* @__PURE__ */ new Map();
   const autoroutersByPhaseIndex = getAutoroutersByPhaseIndex(group);
   const phasePropsByPhaseIndex = getAutoroutingPhasePropsByPhaseIndex(group);
+  const hasDirectRoutingTargets = traces.length > 0 || nets.length > 0;
+  const hasReroutePhase = Array.from(phasePropsByPhaseIndex.values()).some(
+    (phaseProps) => phaseProps.reroute
+  );
+  if (!hasDirectRoutingTargets && !hasReroutePhase) return [];
   for (const net of nets) {
     const routingPhaseIndex = getNetRoutingPhaseIndex(net);
     getOrCreateRoutingPhasePlan(plansByPhaseIndex, routingPhaseIndex).nets.push(
@@ -18575,7 +18587,7 @@ function Group_getRoutingPhasePlans(group) {
     plan.drcTolerances = phaseProps ? getDrcTolerancesFromAutoroutingPhaseProps(phaseProps) : void 0;
   }
   const defaultPhaseProps = phasePropsByPhaseIndex.get(null);
-  if (phasePropsByPhaseIndex.size === 1 && defaultPhaseProps?.reroute && plans.length === 1 && plans[0]?.routingPhaseIndex === null) {
+  if (hasDirectRoutingTargets && phasePropsByPhaseIndex.size === 1 && defaultPhaseProps?.reroute && plans.length === 1 && plans[0]?.routingPhaseIndex === null) {
     const reroutePlan = plans[0];
     return [
       {
@@ -19004,6 +19016,110 @@ function insertAutoplacedJumpers(params) {
   }
 }
 
+// lib/components/primitive-components/Group/region-replacement/convert-pcb-trace-to-simplified-pcb-trace.ts
+function convertPcbTraceToSimplifiedPcbTrace(trace) {
+  return {
+    ...trace,
+    type: "pcb_trace",
+    pcb_trace_id: trace.pcb_trace_id,
+    connection_name: trace.connection_name ?? trace.source_trace_id ?? trace.pcb_trace_id,
+    route: trace.route.map((point6) => ({ ...point6 }))
+  };
+}
+
+// lib/components/primitive-components/Group/region-replacement/get-relevant-subcircuit-ids-for-reroute.ts
+function getRelevantSubcircuitIdsForReroute(group) {
+  const relevantSubcircuitIds = /* @__PURE__ */ new Set();
+  if (!group.subcircuit_id) return relevantSubcircuitIds;
+  relevantSubcircuitIds.add(group.subcircuit_id);
+  const db = group.root?.db;
+  if (!db) return relevantSubcircuitIds;
+  for (const subcircuitId of getDescendantSubcircuitIds(
+    db,
+    group.subcircuit_id
+  )) {
+    relevantSubcircuitIds.add(subcircuitId);
+  }
+  return relevantSubcircuitIds;
+}
+
+// lib/components/primitive-components/Group/region-replacement/get-existing-pcb-traces-for-reroute.ts
+function getExistingPcbTracesForReroute(group) {
+  const db = group.root?.db;
+  if (!db) return [];
+  const relevantSubcircuitIds = getRelevantSubcircuitIdsForReroute(group);
+  return db.pcb_trace.list().filter((trace) => {
+    if (!trace.route || trace.route.length < 2) return false;
+    if (!group.subcircuit_id) return true;
+    return Boolean(
+      trace.subcircuit_id && relevantSubcircuitIds.has(trace.subcircuit_id)
+    );
+  });
+}
+
+// lib/components/primitive-components/Group/region-replacement/delete-existing-pcb-traces-replaced-by.ts
+function addPossibleReplacementSourceTraceId(sourceTraceIds, value) {
+  if (typeof value !== "string" || value.length === 0) return;
+  sourceTraceIds.add(value);
+  const rerouteSuffixIndex = value.indexOf("_reroute_");
+  if (rerouteSuffixIndex > 0) {
+    sourceTraceIds.add(value.slice(0, rerouteSuffixIndex));
+  }
+}
+function deleteExistingPcbTracesReplacedBy({
+  group,
+  outputPcbTraces
+}) {
+  const db = group.root?.db;
+  if (!db) return;
+  const replacementPcbTraceIds = /* @__PURE__ */ new Set();
+  const replacementSourceTraceIds = /* @__PURE__ */ new Set();
+  for (const trace of outputPcbTraces) {
+    if (trace.type !== "pcb_trace") continue;
+    const replacementTrace = trace;
+    replacementPcbTraceIds.add(replacementTrace.pcb_trace_id);
+    addPossibleReplacementSourceTraceId(
+      replacementSourceTraceIds,
+      replacementTrace.source_trace_id
+    );
+    addPossibleReplacementSourceTraceId(
+      replacementSourceTraceIds,
+      replacementTrace.connection_name
+    );
+    addPossibleReplacementSourceTraceId(
+      replacementSourceTraceIds,
+      replacementTrace.rootConnectionName
+    );
+  }
+  if (replacementPcbTraceIds.size === 0 && replacementSourceTraceIds.size === 0) {
+    return;
+  }
+  const tracesToDelete = getExistingPcbTracesForReroute(group).filter(
+    (trace) => replacementPcbTraceIds.has(trace.pcb_trace_id) || Boolean(
+      trace.source_trace_id && replacementSourceTraceIds.has(trace.source_trace_id)
+    )
+  );
+  if (tracesToDelete.length === 0) return;
+  const deletedPcbTraceIds = new Set(
+    tracesToDelete.map((trace) => trace.pcb_trace_id)
+  );
+  for (const via of db.pcb_via.list()) {
+    if (via.pcb_trace_id && deletedPcbTraceIds.has(via.pcb_trace_id)) {
+      db.pcb_via.delete(via.pcb_via_id);
+    }
+  }
+  for (const trace of tracesToDelete) {
+    db.pcb_trace.delete(trace.pcb_trace_id);
+  }
+}
+
+// lib/components/primitive-components/Group/region-replacement/get-existing-simplified-pcb-traces-for-reroute.ts
+function getExistingSimplifiedPcbTracesForReroute(group) {
+  return getExistingPcbTracesForReroute(group).map(
+    convertPcbTraceToSimplifiedPcbTrace
+  );
+}
+
 // lib/components/primitive-components/Group/split-pcb-traces-on-jumper-segments.ts
 function splitPcbTracesOnJumperSegments(route) {
   const jumperRoutes = route.filter(
@@ -19449,11 +19565,23 @@ var Group6 = class extends NormalComponent3 {
     const debug11 = Debug13("tscircuit:core:_hasTracesToRoute");
     const routingPhasePlans = this._getRoutingPhasePlans();
     let traceCount = 0;
+    let hasReroutePhaseWithRegion = false;
     for (const routingPhasePlan of routingPhasePlans) {
       traceCount += routingPhasePlan.traces.length;
+      hasReroutePhaseWithRegion ||= Boolean(
+        routingPhasePlan.reroute && routingPhasePlan.region
+      );
     }
     debug11(`[${this.getString()}] has ${traceCount} traces to route`);
-    return traceCount > 0;
+    if (traceCount > 0) return true;
+    if (hasReroutePhaseWithRegion) {
+      const existingTraceCount = getExistingPcbTracesForReroute(this).length;
+      debug11(
+        `[${this.getString()}] has ${existingTraceCount} existing pcb traces available for reroute`
+      );
+      return existingTraceCount > 0;
+    }
+    return false;
   }
   async _runEffectMakeHttpAutoroutingRequest() {
     const { db } = this.root;
@@ -19598,6 +19726,7 @@ var Group6 = class extends NormalComponent3 {
     const hasPhasedAutorouting = Group_hasPhasedAutorouting(routingPhasePlans);
     const outputTraces = [];
     const outputJumpers = [];
+    const existingRerouteSeedTraces = getExistingSimplifiedPcbTracesForReroute(this);
     for (const routingPhasePlan of routingPhasePlans) {
       const phaseAutorouterConfig = routingPhasePlan.autorouter ? getPresetAutoroutingConfig(
         routingPhasePlan.autorouter,
@@ -19609,7 +19738,7 @@ var Group6 = class extends NormalComponent3 {
       );
       const rerouteOriginalSrj = isReroutePhase ? {
         ...baseSimpleRouteJson,
-        traces: outputTraces
+        traces: [...existingRerouteSeedTraces, ...outputTraces]
       } : null;
       if (isReroutePhase && rerouteOriginalSrj) {
         simpleRouteJson = getRerouteSimpleRouteJson(
@@ -19633,7 +19762,7 @@ var Group6 = class extends NormalComponent3 {
         simpleRouteJson,
         routingPhasePlan.drcTolerances
       );
-      if (hasPhasedAutorouting && simpleRouteJson.connections.length === 0) {
+      if ((hasPhasedAutorouting || isReroutePhase) && simpleRouteJson.connections.length === 0) {
         continue;
       }
       const phaseIsAutoJumperPreset = routingPhasePlan.autorouter !== void 0 ? this._isAutoJumperAutorouter(phaseAutorouterConfig) : isAutoJumperPreset;
@@ -19864,13 +19993,17 @@ var Group6 = class extends NormalComponent3 {
         subcircuit_id: this.subcircuit_id
       });
     }
+    deleteExistingPcbTracesReplacedBy({
+      group: this,
+      outputPcbTraces: output_pcb_traces
+    });
     for (const pcb_trace of output_pcb_traces) {
       if (pcb_trace.type !== "pcb_trace") continue;
-      pcb_trace.subcircuit_id = this.subcircuit_id;
-      if (pcb_trace.connection_name) {
-        const sourceTraceId = pcb_trace.connection_name;
+      const sourceTraceId = pcb_trace.source_trace_id ?? pcb_trace.connection_name;
+      if (sourceTraceId) {
         pcb_trace.source_trace_id = sourceTraceId;
       }
+      pcb_trace.subcircuit_id ??= (sourceTraceId ? db.source_trace.get(sourceTraceId)?.subcircuit_id : void 0) ?? this.subcircuit_id;
       let segments = splitPcbTracesOnJumperSegments(pcb_trace.route);
       if (segments === null) {
         segments = [pcb_trace.route];
@@ -20965,7 +21098,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1241",
+  version: "0.0.1242",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21039,7 +21172,7 @@ var package_default = {
     flatbush: "^4.5.0",
     "graphics-debug": "^0.0.89",
     howfat: "^0.3.8",
-    "kicad-to-circuit-json": "^0.0.59",
+    "kicad-to-circuit-json": "^0.0.60",
     kicadts: "^0.0.35",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
@@ -21050,6 +21183,7 @@ var package_default = {
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.208",
     spicey: "^0.0.14",
+    "stack-svgs": "^0.0.1",
     "ts-expect": "^1.3.0",
     tsup: "^8.2.4"
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1242",
+  "version": "0.0.1243",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -75,7 +75,7 @@
     "flatbush": "^4.5.0",
     "graphics-debug": "^0.0.89",
     "howfat": "^0.3.8",
-    "kicad-to-circuit-json": "^0.0.59",
+    "kicad-to-circuit-json": "^0.0.60",
     "kicadts": "^0.0.35",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
@@ -86,6 +86,7 @@
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.208",
     "spicey": "^0.0.14",
+    "stack-svgs": "^0.0.1",
     "ts-expect": "^1.3.0",
     "tsup": "^8.2.4"
   },