biscuitboard 1.0.17 → 1.0.18

package/dist/npm.cjs

@@ -8658,6 +8658,8 @@ var BuildBiscuitBoardTracesSolver = class extends BaseSolver {
     const protectedNodeIndexes = /* @__PURE__ */ new Set();
     for (const route of this.routed.routes) {
       const demand = this.prepared.demandById.get(route.routeId);
+      protectedNodeIndexes.add(demand.sourceNode);
+      protectedNodeIndexes.add(demand.targetNode);
       for (const endpointNode of [route.nodePath[0], route.nodePath.at(-1)]) {
         if (endpointNode !== void 0 && endpointNode !== demand.sourceNode && endpointNode !== demand.targetNode) {
           protectedNodeIndexes.add(endpointNode);
@@ -11455,6 +11457,8 @@ var postProcessBiscuitBoardTracesOnce = (prepared, solution) => {
   const protectedJunctionKeys = /* @__PURE__ */ new Set();
   for (const route of solution.routes) {
     const demand = prepared.demandById.get(route.routeId);
+    protectedJunctionKeys.add(junctionKey(prepared.nodes[demand.sourceNode]));
+    protectedJunctionKeys.add(junctionKey(prepared.nodes[demand.targetNode]));
     for (const endpointNode of [route.nodePath[0], route.nodePath.at(-1)]) {
       if (endpointNode !== void 0 && endpointNode !== demand.sourceNode && endpointNode !== demand.targetNode) {
         protectedJunctionKeys.add(junctionKey(prepared.nodes[endpointNode]));
@@ -11723,7 +11727,13 @@ var getIndexedWireSegments = (trace) => {
   }
   return segments;
 };
-var getProtectedJunctionKeys = (traces) => {
+var getProtectedJunctionKeys = (prepared, traces) => {
+  const protectedKeys = new Set(
+    prepared.demands.flatMap((demand) => [
+      pointKey(prepared.nodes[demand.sourceNode]),
+      pointKey(prepared.nodes[demand.targetNode])
+    ])
+  );
   const traceIndexesByPoint = /* @__PURE__ */ new Map();
   for (const [traceIndex, trace] of traces.entries()) {
     for (const point of trace.route) {
@@ -11733,9 +11743,10 @@ var getProtectedJunctionKeys = (traces) => {
       traceIndexesByPoint.set(pointKey(point), indexes);
     }
   }
-  return new Set(
-    [...traceIndexesByPoint.entries()].filter(([, traceIndexes]) => traceIndexes.size > 1).map(([key]) => key)
-  );
+  for (const [key, traceIndexes] of traceIndexesByPoint) {
+    if (traceIndexes.size > 1) protectedKeys.add(key);
+  }
+  return protectedKeys;
 };
 var routeGeometryEqual = (first, second) => first.length === second.length && first.every((point, index) => {
   const other = second[index];
@@ -11909,7 +11920,7 @@ var createParallelConsolidationCandidate = (prepared, solution, traceIndex, rout
 };
 var consolidateSameNetTraces = (prepared, solution, clearance) => {
   const traces = cloneTraces2(solution.traces);
-  const protectedJunctionKeys = getProtectedJunctionKeys(traces);
+  const protectedJunctionKeys = getProtectedJunctionKeys(prepared, traces);
   let consolidationCount = 0;
   for (let pass = 0; pass < traces.length; pass++) {
     let changed = false;
@@ -12079,7 +12090,7 @@ var isManhattanCorner = (previous, corner, next) => {
 };
 var chamferTraceCorners = (prepared, solution, clearance) => {
   const traces = cloneTraces2(solution.traces);
-  const protectedJunctionKeys = getProtectedJunctionKeys(traces);
+  const protectedJunctionKeys = getProtectedJunctionKeys(prepared, traces);
   let chamferCount = 0;
   for (let traceIndex = 0; traceIndex < traces.length; traceIndex++) {
     let route = traces[traceIndex].route;
@@ -13625,7 +13636,17 @@ var getTraceEndpoints = (trace) => {
   );
   return wires.length === 0 ? [] : [wires[0], wires.at(-1)];
 };
-var getTraceEndpointKeys = (trace) => getTraceEndpoints(trace).map(vertexKey);
+var getDemandTerminalKeys = ({
+  prepared,
+  solution,
+  traceIndex
+}) => {
+  const demand = prepared.demandById.get(solution.routes[traceIndex].routeId);
+  return [
+    vertexKey(prepared.nodes[demand.sourceNode]),
+    vertexKey(prepared.nodes[demand.targetNode])
+  ];
+};
 var addSplitRatio = (segment, ratio) => {
   if (ratio < -EPSILON4 || ratio > 1 + EPSILON4) return;
   const clamped = Math.max(0, Math.min(1, ratio));
@@ -13693,8 +13714,7 @@ var buildCopperGraph = (prepared, traces) => {
   const graph = {
     vertices: /* @__PURE__ */ new Map(),
     edges: /* @__PURE__ */ new Map(),
-    adjacency: /* @__PURE__ */ new Map(),
-    edgeKeysByTrace: traces.map(() => /* @__PURE__ */ new Set())
+    adjacency: /* @__PURE__ */ new Map()
   };
   const segments = [];
   for (let traceIndex = 0; traceIndex < traces.length; traceIndex++) {
@@ -13706,8 +13726,7 @@ var buildCopperGraph = (prepared, traces) => {
         segments.push({
           start: point,
           end: next,
-          splitRatios: [0, 1],
-          traceIndex
+          splitRatios: [0, 1]
         });
       }
       if (point.route_type !== "through_obstacle") continue;
@@ -13740,7 +13759,6 @@ var buildCopperGraph = (prepared, traces) => {
         kind: "fixed_via",
         prefabViaId: prefabVia.prefabViaId
       });
-      graph.edgeKeysByTrace[traceIndex].add(key);
     }
   }
   const traceEndpoints = traces.flatMap(getTraceEndpoints);
@@ -13777,7 +13795,6 @@ var buildCopperGraph = (prepared, traces) => {
         cost: Math.hypot(first.x - second.x, first.y - second.y),
         kind: "wire"
       });
-      graph.edgeKeysByTrace[segment.traceIndex].add(key);
     }
   }
   finishGraph(graph);
@@ -13811,7 +13828,9 @@ var selectTerminalTree = (graph, terminalKeys) => {
       );
     }
   }
-  const parent = new Map([...graph.vertices.keys()].map((key) => [key, key]));
+  const parent = new Map(
+    [...graph.vertices.keys()].map((key) => [key, key])
+  );
   const find = (key) => {
     const current = parent.get(key);
     if (current === key) return key;
@@ -13926,8 +13945,8 @@ var pathToTrace = (prepared, demand, original, graph, path, sourceKey) => {
     ...original,
     connectsTo: [
       .../* @__PURE__ */ new Set([
-        ...(original.connectsTo ?? []).filter(
-          (id) => !prepared.fixedViaById.has(id)
+        ...[demand.sourcePointId, demand.targetPointId].filter(
+          (id) => Boolean(id)
         ),
         ...usedViaIds
       ])
@@ -13953,23 +13972,24 @@ var pruneRedundantSameNetCopper = (prepared, solution) => {
     );
     if (!graphHasCycle(graph)) continue;
     const terminalKeys = indexes.flatMap(
-      (index) => getTraceEndpointKeys(solution.traces[index])
+      (traceIndex) => getDemandTerminalKeys({ prepared, solution, traceIndex })
     );
     const selectedEdges = selectTerminalTree(graph, terminalKeys);
     const originalNetTraces = indexes.map((index) => traces[index]);
     for (let netTraceIndex = 0; netTraceIndex < indexes.length; netTraceIndex++) {
-      const index = indexes[netTraceIndex];
-      const originalUsesPrunedEdge = [
-        ...graph.edgeKeysByTrace[netTraceIndex]
-      ].some((edge) => !selectedEdges.has(edge));
-      if (!originalUsesPrunedEdge) continue;
-      const demand = prepared.demandById.get(solution.routes[index].routeId);
-      const [source, target] = getTraceEndpointKeys(solution.traces[index]);
-      if (!source || !target) continue;
-      traces[index] = pathToTrace(
+      const traceIndex = indexes[netTraceIndex];
+      const demand = prepared.demandById.get(
+        solution.routes[traceIndex].routeId
+      );
+      const [source, target] = getDemandTerminalKeys({
+        prepared,
+        solution,
+        traceIndex
+      });
+      traces[traceIndex] = pathToTrace(
         prepared,
         demand,
-        solution.traces[index],
+        solution.traces[traceIndex],
         graph,
         findTreePath(graph, selectedEdges, source, target),
         source
@@ -14395,6 +14415,7 @@ var BiscuitBoard = ({
   autorouterOptions,
   minTraceWidth,
   nominalTraceWidth = 0.3,
+  autorouterEdgeClearance,
   routingDisabled = false
 }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
   "board",
@@ -14412,7 +14433,7 @@ var BiscuitBoard = ({
     autorouter: autorouter ?? createPrefabricatedViaAutorouter({
       width: BISCUIT_BOARD_WIDTH,
       height: BISCUIT_BOARD_HEIGHT,
-      edgeClearance: BISCUIT_BOARD_EDGE_CLEARANCE,
+      edgeClearance: autorouterEdgeClearance ?? BISCUIT_BOARD_EDGE_CLEARANCE,
       options: autorouterOptions,
       minimumTraceWidth: minTraceWidth,
       nominalTraceWidth