@skillpet/circuit 0.6.1 → 0.6.2

package/dist/circuit.bundle.js

@@ -17738,29 +17738,52 @@ var Circuit = (() => {
     const p = mergeParamsFirstWins(el.userParams, el.elmParams, el.defaults, el.dwgParams);
     return p.color ?? "black";
   }
+  function getOutputAnchors(el) {
+    const pts = [];
+    const aa = el.absanchors;
+    if (aa.end) pts.push(aa.end);
+    if (aa.out && (!aa.end || !pointsClose(aa.out, aa.end, 0.01))) pts.push(aa.out);
+    return pts;
+  }
+  function getInputAnchors(el) {
+    const pts = [];
+    const aa = el.absanchors;
+    if (aa.start) pts.push(aa.start);
+    for (const [name, pt] of Object.entries(aa)) {
+      if (name.startsWith("in") && /^in\d+$/.test(name)) {
+        if (!aa.start || !pointsClose(pt, aa.start, 0.01)) pts.push(pt);
+      }
+    }
+    return pts;
+  }
+  function pointsClose(a, b, tol) {
+    return Math.hypot(a.x - b.x, a.y - b.y) <= tol;
+  }
   function buildConnectionGraph(elements) {
     const edges = [];
     const seen = /* @__PURE__ */ new Set();
     const tol = 0.5;
     for (let i = 0; i < elements.length; i++) {
       const fromEl = elements[i];
-      const fromEnd = fromEl.absanchors.end;
-      if (!fromEnd) continue;
+      const fromPts = getOutputAnchors(fromEl);
+      if (fromPts.length === 0) continue;
+      const fromColor = resolveElementColor(fromEl);
       for (let j = 0; j < elements.length; j++) {
         if (i === j) continue;
         const toEl = elements[j];
-        const toStart = toEl.absanchors.start;
-        if (!toStart) continue;
-        const dx = fromEnd.x - toStart.x;
-        const dy = fromEnd.y - toStart.y;
-        if (Math.hypot(dx, dy) > tol) continue;
-        const fromColor = resolveElementColor(fromEl);
+        const toPts = getInputAnchors(toEl);
+        if (toPts.length === 0) continue;
         const toColor = resolveElementColor(toEl);
         if (colorsEqual(fromColor, toColor)) continue;
-        const key = `${i}|${j}`;
-        if (seen.has(key)) continue;
-        seen.add(key);
-        edges.push({ fromEl, toEl, fromColor, toColor });
+        for (const fp of fromPts) {
+          for (const tp of toPts) {
+            if (!pointsClose(fp, tp, tol)) continue;
+            const key = `${i}|${j}`;
+            if (seen.has(key)) continue;
+            seen.add(key);
+            edges.push({ fromEl, toEl, fromColor, toColor, junctionPt: fp });
+          }
+        }
       }
     }
     return edges;
@@ -17775,8 +17798,8 @@ var Circuit = (() => {
     const cleanups = [];
     let n = 0;
     for (const edge of edges) {
-      const lead2Seg = findLeadSegment(edge.fromEl, "lead2");
-      const lead1Seg = findLeadSegment(edge.toEl, "lead1");
+      const lead2Seg = findLeadSegmentFor(edge.fromEl, "out", edge.junctionPt);
+      const lead1Seg = findLeadSegmentFor(edge.toEl, "in", edge.junctionPt);
       if (!lead2Seg && !lead1Seg) continue;
       if (lead2Seg?.gradientStrokeId && lead1Seg?.gradientStrokeId) continue;
       let gx1, gy1, gx2, gy2;
@@ -17823,11 +17846,32 @@ var Circuit = (() => {
       }
     };
   }
-  function findLeadSegment(el, role) {
+  function findLeadSegmentFor(el, side, junctionPt) {
+    const role = side === "in" ? "lead1" : "lead2";
     for (const s of el.segments) {
       if (s instanceof Segment && s.role === role) return s;
     }
-    return void 0;
+    return findSegmentNearPoint(el, junctionPt);
+  }
+  function findSegmentNearPoint(el, absPt) {
+    let best;
+    let bestDist = Infinity;
+    const tol = 0.6;
+    for (const s of el.segments) {
+      if (!(s instanceof Segment)) continue;
+      if (s.path.length < 2) continue;
+      if (s.role === "body") continue;
+      const p0 = el.transform.transform(s.path[0]);
+      const pN = el.transform.transform(s.path[s.path.length - 1]);
+      const d0 = Math.hypot(p0.x - absPt.x, p0.y - absPt.y);
+      const dN = Math.hypot(pN.x - absPt.x, pN.y - absPt.y);
+      const d = Math.min(d0, dN);
+      if (d < bestDist && d < tol) {
+        bestDist = d;
+        best = s;
+      }
+    }
+    return best;
   }
   function segEndpointsSvg(el, seg, scale) {
     const p0 = el.transform.transform(seg.path[0]);