@tscircuit/schematic-trace-solver 0.0.28 → 0.0.29

package/dist/index.js

@@ -469,6 +469,68 @@ var dir = (facingDirection) => {
 // lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/generateElbowVariants.ts
 var EPS = 1e-6;
 var MIN_LEN = 1e-6;
+var checkIfUTurnNeeded = (elbow) => {
+  if (elbow.length !== 4) return false;
+  const [start, p1, p2, end] = elbow;
+  const startOrient = orientationOf(start, p1);
+  const startFacing = startOrient === "horizontal" ? p1.x > start.x ? "x+" : "x-" : p1.y > start.y ? "y+" : "y-";
+  const endOrient = orientationOf(p2, end);
+  const endFacing = endOrient === "horizontal" ? end.x > p2.x ? "x+" : "x-" : end.y > p2.y ? "y+" : "y-";
+  if (startFacing === "x+" && end.x < p1.x - EPS) return true;
+  if (startFacing === "x-" && end.x > p1.x + EPS) return true;
+  if (startFacing === "y+" && end.y < p1.y - EPS) return true;
+  if (startFacing === "y-" && end.y > p1.y + EPS) return true;
+  if (endFacing === "x-" && p2.x > end.x + EPS && startFacing === "x+")
+    return true;
+  if (endFacing === "x+" && p2.x < end.x - EPS && startFacing === "x-")
+    return true;
+  if (endFacing === "y-" && p2.y > end.y + EPS && startFacing === "y+")
+    return true;
+  if (endFacing === "y+" && p2.y < end.y - EPS && startFacing === "y-")
+    return true;
+  return false;
+};
+var expandToUTurn = (elbow) => {
+  if (elbow.length !== 4) return elbow;
+  const [start, p1, p2, end] = elbow;
+  const overshoot = Math.max(
+    Math.abs(start.x - p1.x),
+    Math.abs(start.y - p1.y),
+    0.2
+    // minimum overshoot
+  );
+  const startOrient = orientationOf(start, p1);
+  const expanded = [{ ...start }];
+  if (startOrient === "horizontal") {
+    const startDir = p1.x > start.x ? 1 : -1;
+    expanded.push({ x: start.x + startDir * overshoot, y: start.y });
+    const verticalSpace = Math.max(
+      overshoot * 2,
+      Math.abs(end.y - start.y) + overshoot
+    );
+    const midY = end.y > start.y ? start.y - verticalSpace : start.y + verticalSpace;
+    expanded.push({ x: start.x + startDir * overshoot, y: midY });
+    const endOrient = orientationOf(p2, end);
+    const endApproachX = endOrient === "horizontal" ? end.x > p2.x ? end.x - overshoot : end.x + overshoot : end.x;
+    expanded.push({ x: endApproachX, y: midY });
+    expanded.push({ x: endApproachX, y: end.y });
+  } else {
+    const startDir = p1.y > start.y ? 1 : -1;
+    expanded.push({ x: start.x, y: start.y + startDir * overshoot });
+    const horizontalSpace = Math.max(
+      overshoot * 2,
+      Math.abs(end.x - start.x) + overshoot
+    );
+    const midX = end.x > start.x ? start.x - horizontalSpace : start.x + horizontalSpace;
+    expanded.push({ x: midX, y: start.y + startDir * overshoot });
+    const endOrient = orientationOf(p2, end);
+    const endApproachY = endOrient === "vertical" ? end.y > p2.y ? end.y - overshoot : end.y + overshoot : end.y;
+    expanded.push({ x: midX, y: endApproachY });
+    expanded.push({ x: end.x, y: endApproachY });
+  }
+  expanded.push({ ...end });
+  return expanded;
+};
 var isAxisAligned = (a, b) => Math.abs(a.x - b.x) < EPS || Math.abs(a.y - b.y) < EPS;
 var orientationOf = (a, b) => {
   const dx = Math.abs(a.x - b.x);
@@ -550,15 +612,20 @@ var generateElbowVariants = ({
   const elbow = preprocessElbow(baseElbow);
   assertOrthogonalPolyline(elbow);
   const nPts = elbow.length;
-  const nSegs = nPts - 1;
-  if (nSegs < 5) {
+  if (nPts < 4) {
     return {
       elbowVariants: [elbow.map((p) => ({ ...p }))],
       movableSegments: []
     };
+  } else if (nPts === 4) {
+    const needsUTurn = checkIfUTurnNeeded(elbow);
+    if (needsUTurn) {
+      const expandedElbow = expandToUTurn(elbow);
+      return generateElbowVariants({ baseElbow: expandedElbow, guidelines });
+    }
   }
-  const firstMovableIndex = 2;
-  const lastMovableIndex = nPts - 4;
+  const firstMovableIndex = 1;
+  const lastMovableIndex = nPts - 3;
   const movableSegments = [];
   const movableIdx = [];
   const axes = [];

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/generateElbowVariants.ts

@@ -14,6 +14,123 @@ export interface MovableSegment {
 const EPS = 1e-6 // numeric tolerance for equality
 const MIN_LEN = 1e-6 // forbid near-zero length segments (adjacent collapses)
 
+const checkIfUTurnNeeded = (elbow: Point[]): boolean => {
+  if (elbow.length !== 4) return false
+
+  const [start, p1, p2, end] = elbow
+
+  // Determine facing directions from the path segments
+  const startOrient = orientationOf(start, p1)
+  const startFacing: FacingDirection =
+    startOrient === "horizontal"
+      ? p1.x > start.x
+        ? "x+"
+        : "x-"
+      : p1.y > start.y
+        ? "y+"
+        : "y-"
+
+  const endOrient = orientationOf(p2, end)
+  const endFacing: FacingDirection =
+    endOrient === "horizontal"
+      ? end.x > p2.x
+        ? "x+"
+        : "x-"
+      : end.y > p2.y
+        ? "y+"
+        : "y-"
+
+  // Check if path overshoots and needs to turn back
+  if (startFacing === "x+" && end.x < p1.x - EPS) return true
+  if (startFacing === "x-" && end.x > p1.x + EPS) return true
+  if (startFacing === "y+" && end.y < p1.y - EPS) return true
+  if (startFacing === "y-" && end.y > p1.y + EPS) return true
+
+  // Check if path segments conflict (p2 is past the end in the facing direction)
+  if (endFacing === "x-" && p2.x > end.x + EPS && startFacing === "x+")
+    return true
+  if (endFacing === "x+" && p2.x < end.x - EPS && startFacing === "x-")
+    return true
+  if (endFacing === "y-" && p2.y > end.y + EPS && startFacing === "y+")
+    return true
+  if (endFacing === "y+" && p2.y < end.y - EPS && startFacing === "y-")
+    return true
+
+  return false
+}
+
+const expandToUTurn = (elbow: Point[]): Point[] => {
+  if (elbow.length !== 4) return elbow
+
+  const [start, p1, p2, end] = elbow
+
+  // Calculate overshoot distance from existing segments
+  const overshoot = Math.max(
+    Math.abs(start.x - p1.x),
+    Math.abs(start.y - p1.y),
+    0.2, // minimum overshoot
+  )
+
+  const startOrient = orientationOf(start, p1)
+  const expanded: Point[] = [{ ...start }]
+
+  if (startOrient === "horizontal") {
+    const startDir = p1.x > start.x ? 1 : -1
+    expanded.push({ x: start.x + startDir * overshoot, y: start.y })
+
+    // Move away vertically to create space for U-turn
+    const verticalSpace = Math.max(
+      overshoot * 2,
+      Math.abs(end.y - start.y) + overshoot,
+    )
+    const midY =
+      end.y > start.y ? start.y - verticalSpace : start.y + verticalSpace
+
+    expanded.push({ x: start.x + startDir * overshoot, y: midY })
+
+    // Approach end from its required direction
+    const endOrient = orientationOf(p2, end)
+    const endApproachX =
+      endOrient === "horizontal"
+        ? end.x > p2.x
+          ? end.x - overshoot
+          : end.x + overshoot
+        : end.x
+
+    expanded.push({ x: endApproachX, y: midY })
+    expanded.push({ x: endApproachX, y: end.y })
+  } else {
+    // Vertical start
+    const startDir = p1.y > start.y ? 1 : -1
+    expanded.push({ x: start.x, y: start.y + startDir * overshoot })
+
+    // Move away horizontally to create space for U-turn
+    const horizontalSpace = Math.max(
+      overshoot * 2,
+      Math.abs(end.x - start.x) + overshoot,
+    )
+    const midX =
+      end.x > start.x ? start.x - horizontalSpace : start.x + horizontalSpace
+
+    expanded.push({ x: midX, y: start.y + startDir * overshoot })
+
+    // Approach end from its required direction
+    const endOrient = orientationOf(p2, end)
+    const endApproachY =
+      endOrient === "vertical"
+        ? end.y > p2.y
+          ? end.y - overshoot
+          : end.y + overshoot
+        : end.y
+
+    expanded.push({ x: midX, y: endApproachY })
+    expanded.push({ x: end.x, y: endApproachY })
+  }
+
+  expanded.push({ ...end })
+  return expanded
+}
+
 /** True if segment [a,b] is axis-aligned (horizontal or vertical). */
 const isAxisAligned = (a: Point, b: Point): boolean =>
   Math.abs(a.x - b.x) < EPS || Math.abs(a.y - b.y) < EPS
@@ -155,21 +272,27 @@ export const generateElbowVariants = ({
   assertOrthogonalPolyline(elbow)
 
   const nPts = elbow.length
-  const nSegs = nPts - 1
 
   // No interior segments to move if path is too short.
-  if (nSegs < 5) {
+  if (nPts < 4) {
     return {
       elbowVariants: [elbow.map((p) => ({ ...p }))],
       movableSegments: [],
     }
+  } else if (nPts === 4) {
+    const needsUTurn = checkIfUTurnNeeded(elbow)
+    if (needsUTurn) {
+      const expandedElbow = expandToUTurn(elbow)
+      // Recursively call with the expanded path
+      return generateElbowVariants({ baseElbow: expandedElbow, guidelines })
+    }
   }
 
   // 2) Choose which segments are allowed to move.
-  //    We avoid segments adjacent to the first and last segment:
-  //    movable indices i in [2 .. (nPts - 4)] inclusive (segment i connects P[i] -> P[i+1]).
-  const firstMovableIndex = 2
-  const lastMovableIndex = nPts - 4
+  //    We avoid moving the very first and last segments of the:
+  //    movable indices i in [1 .. (nPts - 3)] inclusive (segment i connects P[i] -> P[i+1]).
+  const firstMovableIndex = 1
+  const lastMovableIndex = nPts - 3
 
   const movableSegments: MovableSegment[] = []
   const movableIdx: number[] = []

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/examples/example08.page.tsx

@@ -88,7 +88,7 @@ export const inputProblem: InputProblem = {
   ],
   netConnections: [],
   availableNetLabelOrientations: {},
-  maxMspPairDistance: 2,
+  maxMspPairDistance: 5,
 }
 
 export default () => <PipelineDebugger inputProblem={inputProblem} />

package/tests/examples/__snapshots__/example01.snap.svg

@@ -2,100 +2,97 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="U1.1
-x-" data-x="-0.8" data-y="0.2" cx="422.5742574257426" cy="297.8217821782178" r="3" fill="hsl(319, 100%, 50%, 0.8)" />
+x-" data-x="-0.8" data-y="0.2" cx="422.5742574257426" cy="272.8712871287128" r="3" fill="hsl(319, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.2
-x-" data-x="-0.8" data-y="0" cx="422.5742574257426" cy="320" r="3" fill="hsl(320, 100%, 50%, 0.8)" />
+x-" data-x="-0.8" data-y="0" cx="422.5742574257426" cy="295.049504950495" r="3" fill="hsl(320, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.3
-x-" data-x="-0.8" data-y="-0.2" cx="422.5742574257426" cy="342.1782178217822" r="3" fill="hsl(321, 100%, 50%, 0.8)" />
+x-" data-x="-0.8" data-y="-0.2" cx="422.5742574257426" cy="317.2277227722772" r="3" fill="hsl(321, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.4
-x+" data-x="0.8" data-y="-0.2" cx="600" cy="342.1782178217822" r="3" fill="hsl(322, 100%, 50%, 0.8)" />
+x+" data-x="0.8" data-y="-0.2" cx="600" cy="317.2277227722772" r="3" fill="hsl(322, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.5
-x+" data-x="0.8" data-y="0" cx="600" cy="320" r="3" fill="hsl(323, 100%, 50%, 0.8)" />
+x+" data-x="0.8" data-y="0" cx="600" cy="295.049504950495" r="3" fill="hsl(323, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="U1.6
-x+" data-x="0.8" data-y="0.2" cx="600" cy="297.8217821782178" r="3" fill="hsl(324, 100%, 50%, 0.8)" />
+x+" data-x="0.8" data-y="0.2" cx="600" cy="272.8712871287128" r="3" fill="hsl(324, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C1.1
-y+" data-x="-2" data-y="0.5" cx="289.50495049504957" cy="264.55445544554453" r="3" fill="hsl(121, 100%, 50%, 0.8)" />
+y+" data-x="-2" data-y="0.5" cx="289.50495049504957" cy="239.60396039603958" r="3" fill="hsl(121, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C1.2
-y-" data-x="-2" data-y="-0.5" cx="289.50495049504957" cy="375.44554455445547" r="3" fill="hsl(122, 100%, 50%, 0.8)" />
+y-" data-x="-2" data-y="-0.5" cx="289.50495049504957" cy="350.4950495049505" r="3" fill="hsl(122, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C2.1
-y+" data-x="-4" data-y="0.5" cx="67.72277227722776" cy="264.55445544554453" r="3" fill="hsl(2, 100%, 50%, 0.8)" />
+y+" data-x="-4" data-y="0.5" cx="67.72277227722776" cy="239.60396039603958" r="3" fill="hsl(2, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="C2.2
-y-" data-x="-4" data-y="-0.5" cx="67.72277227722776" cy="375.44554455445547" r="3" fill="hsl(3, 100%, 50%, 0.8)" />
+y-" data-x="-4" data-y="-0.5" cx="67.72277227722776" cy="350.4950495049505" r="3" fill="hsl(3, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-1.4" data-y="0.7" cx="356.0396039603961" cy="242.3762376237624" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.1" data-y="0.20000000000000018" cx="389.3069306930693" cy="272.8712871287128" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-0.8" data-y="0" cx="422.5742574257426" cy="320" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.275" data-y="0" cx="369.90099009900996" cy="295.049504950495" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-4" data-y="0.5" cx="67.72277227722776" cy="264.55445544554453" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-4" data-y="-0.7000000000000002" cx="67.72277227722776" cy="372.6732673267327" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-1.4" data-y="-0.7" cx="356.0396039603961" cy="397.6237623762376" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <polyline data-points="-0.8,0.2 -2,0.5" data-type="line" data-label="" points="422.5742574257426,272.8712871287128 289.50495049504957,239.60396039603958" fill="none" stroke="hsl(190, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.8,0.2 -2,0.5" data-type="line" data-label="" points="422.5742574257426,297.8217821782178 289.50495049504957,264.55445544554453" fill="none" stroke="hsl(190, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="-0.8,0 -4,0.5" data-type="line" data-label="" points="422.5742574257426,295.049504950495 67.72277227722776,239.60396039603958" fill="none" stroke="hsl(57, 100%, 50%, 0.8)" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.8,0 -4,0.5" data-type="line" data-label="" points="422.5742574257426,320 67.72277227722776,264.55445544554453" fill="none" stroke="hsl(57, 100%, 50%, 0.8)" stroke-width="1" />
+    <polyline data-points="-0.8,-0.2 -4,-0.5" data-type="line" data-label="" points="422.5742574257426,317.2277227722772 67.72277227722776,350.4950495049505" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-0.8,-0.2 -4,-0.5" data-type="line" data-label="" points="422.5742574257426,342.1782178217822 67.72277227722776,375.44554455445547" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-0.8,-0.2 -2,-0.5" data-type="line" data-label="" points="422.5742574257426,317.2277227722772 289.50495049504957,350.4950495049505" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-0.8,-0.2 -2,-0.5" data-type="line" data-label="" points="422.5742574257426,342.1782178217822 289.50495049504957,375.44554455445547" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-4,-0.5 -2,-0.5" data-type="line" data-label="" points="67.72277227722776,350.4950495049505 289.50495049504957,350.4950495049505" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-4,-0.5 -2,-0.5" data-type="line" data-label="" points="67.72277227722776,375.44554455445547 289.50495049504957,375.44554455445547" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="-0.8,0.20000000000000018 -1.4,0.20000000000000018 -1.4,0.5 -2,0.5" data-type="line" data-label="" points="422.5742574257426,272.8712871287128 356.0396039603961,272.8712871287128 356.0396039603961,239.60396039603958 289.50495049504957,239.60396039603958" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.8,0.20000000000000018 -1.4,0.20000000000000018 -1.4,0.7 -2,0.7 -2,0.5" data-type="line" data-label="" points="422.5742574257426,297.8217821782178 356.0396039603961,297.8217821782178 356.0396039603961,242.3762376237624 289.50495049504957,242.3762376237624 289.50495049504957,264.55445544554453" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-0.7999999999999998,0 -1.275,0 -1.275,0.7 -4,0.7 -4,0.5" data-type="line" data-label="" points="422.57425742574264,295.049504950495 369.90099009900996,295.049504950495 369.90099009900996,217.4257425742574 67.72277227722776,217.4257425742574 67.72277227722776,239.60396039603958" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-0.8,-0.20000000000000018 -1.4,-0.20000000000000018 -1.4,-0.7 -2,-0.7 -2,-0.5" data-type="line" data-label="" points="422.5742574257426,342.1782178217822 356.0396039603961,342.1782178217822 356.0396039603961,397.6237623762376 289.50495049504957,397.6237623762376 289.50495049504957,375.44554455445547" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-0.8,-0.20000000000000018 -1.4,-0.20000000000000018 -1.4,-0.6 -2,-0.6 -2,-0.5" data-type="line" data-label="" points="422.5742574257426,317.2277227722772 356.0396039603961,317.2277227722772 356.0396039603961,361.58415841584156 289.50495049504957,361.58415841584156 289.50495049504957,350.4950495049505" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-4,-0.5 -4,-0.7000000000000002 -2,-0.7000000000000002 -2,-0.5" data-type="line" data-label="" points="67.72277227722776,375.44554455445547 67.72277227722776,397.62376237623766 289.50495049504957,397.62376237623766 289.50495049504957,375.44554455445547" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-4,-0.5 -4,-0.7000000000000002 -2,-0.7000000000000002 -2,-0.5" data-type="line" data-label="" points="67.72277227722776,350.4950495049505 67.72277227722776,372.6732673267327 289.50495049504957,372.6732673267327 289.50495049504957,350.4950495049505" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="422.5742574257426" y="286.73267326732673" width="177.4257425742574" height="66.53465346534654" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="422.5742574257426" y="261.78217821782175" width="177.4257425742574" height="66.53465346534654" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g>
-    <rect data-type="rect" data-label="C1" data-x="-2" data-y="0" x="261.7821782178218" y="264.55445544554453" width="55.445544554455466" height="110.89108910891093" fill="hsl(326, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="C1" data-x="-2" data-y="0" x="261.7821782178218" y="239.60396039603958" width="55.445544554455466" height="110.8910891089109" fill="hsl(326, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g>
-    <rect data-type="rect" data-label="C2" data-x="-4" data-y="0" x="40.00000000000006" y="264.55445544554453" width="55.44554455445541" height="110.89108910891093" fill="hsl(327, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="C2" data-x="-4" data-y="0" x="40.00000000000006" y="239.60396039603958" width="55.44554455445541" height="110.8910891089109" fill="hsl(327, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-1.4" data-y="0.9249999999999999" x="344.950495049505" y="192.4752475247525" width="22.178217821782198" height="49.9009900990099" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="" data-x="-1.1" data-y="0.42500000000000016" x="378.21782178217825" y="222.97029702970292" width="22.178217821782198" height="49.9009900990099" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-1.026" data-y="0" x="372.56237623762377" y="308.91089108910893" width="49.90099009900996" height="22.17821782178214" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="" data-x="-1.5" data-y="0" x="320" y="283.96039603960395" width="49.90099009900996" height="22.17821782178214" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-4" data-y="0.726" x="56.63366336633669" y="214.54257425742574" width="22.17821782178214" height="49.90099009900993" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
-  </g>
-  <g>
-    <rect data-type="rect" data-label="" data-x="-1.4" data-y="-0.9249999999999999" x="344.950495049505" y="397.6237623762376" width="22.178217821782198" height="49.9009900990099" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
+    <rect data-type="rect" data-label="" data-x="-4" data-y="-0.9250000000000002" x="56.63366336633669" y="372.6732673267327" width="22.17821782178214" height="49.900990099009846" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.009017857142857143" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -130,7 +127,7 @@ y-" data-x="-4" data-y="-0.5" cx="67.72277227722776" cy="375.44554455445547" r="
         "e": 511.2871287128713,
         "b": 0,
         "d": -110.89108910891089,
-        "f": 320
+        "f": 295.049504950495
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute:

package/tests/examples/__snapshots__/example02.snap.svg

@@ -53,7 +53,7 @@ x+" data-x="1" data-y="-0.1" cx="500.20151295522464" cy="341.11637364700744" r="
 x+" data-x="1" data-y="0.1" cx="500.20151295522464" cy="324.189420823755" r="3" fill="hsl(323, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-1.4574283249999997" data-y="1.3024186000000004" cx="292.2176463362275" cy="222.4230062437483" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-3.0440232499999995" data-y="1.3024186000000004" cx="157.93655911079327" cy="222.4230062437483" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="" data-x="-3.0434765500000003" data-y="-0.2000000000000004" cx="157.98282893633558" cy="349.5798500586337" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
@@ -158,10 +158,10 @@ x+" data-x="1" data-y="0.1" cx="500.20151295522464" cy="324.189420823755" r="3"
     <polyline data-points="-1.9148566499999995,1.1024186000000002 -1.9148566499999995,1.3024186000000004 -3.0440232499999995,1.3024186000000004 -3.0440232499999995,1.1024186000000002" data-type="line" data-label="" points="253.50330794975545,239.3499590670008 253.50330794975545,222.4230062437483 157.93655911079327,222.4230062437483 157.93655911079327,239.3499590670008" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1,0.20000000000000018 -1.4574283249999997,0.20000000000000018 -1.4574283249999997,1.3024186000000004 -1.9148566499999995,1.3024186000000004 -1.9148566499999995,1.1024186000000005" data-type="line" data-label="" points="330.93198472269955,315.7259444121287 292.2176463362275,315.7259444121287 292.2176463362275,222.4230062437483 253.50330794975545,222.4230062437483 253.50330794975545,239.34995906700078" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,0.20000000000000018 -1.4574283249999997,0.20000000000000018 -1.4574283249999997,1.2024186000000006 -1.9148566499999995,1.2024186000000006 -1.9148566499999995,1.1024186000000005" data-type="line" data-label="" points="330.93198472269955,315.7259444121287 292.2176463362275,315.7259444121287 292.2176463362275,230.88648265537452 253.50330794975545,230.88648265537452 253.50330794975545,239.34995906700078" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1,-0.2 -1.3,-0.2 -1.3,0.2 -1,0.2" data-type="line" data-label="" points="330.93198472269955,349.5798500586337 305.5415554878208,349.5798500586337 305.5415554878208,315.7259444121287 330.93198472269955,315.7259444121287" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,-0.2 -1.2,-0.2 -1.2,0.2 -1,0.2" data-type="line" data-label="" points="330.93198472269955,349.5798500586337 314.0050318994471,349.5798500586337 314.0050318994471,315.7259444121287 330.93198472269955,315.7259444121287" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="-3.0434765500000003,-2.220446049250313e-16 -3.0434765500000003,-0.2000000000000004 -4.17264315,-0.2000000000000004 -4.17264315,-2.220446049250313e-16" data-type="line" data-label="" points="157.98282893633558,332.6528972353812 157.98282893633558,349.5798500586337 62.41608009737348,349.5798500586337 62.41608009737348,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
@@ -170,7 +170,7 @@ x+" data-x="1" data-y="0.1" cx="500.20151295522464" cy="324.189420823755" r="3"
     <polyline data-points="-1.9143099500000003,-2.220446049250313e-16 -1.9143099500000003,-0.2000000000000004 -3.0434765500000003,-0.2000000000000004 -3.0434765500000003,-2.220446049250313e-16" data-type="line" data-label="" points="253.54957777529776,332.6528972353812 253.54957777529776,349.5798500586337 157.98282893633558,349.5798500586337 157.98282893633558,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1,0 -1.0999999999999999,0 -1.0999999999999999,-0.09999999999999995 -1.9143099500000003,-0.09999999999999995 -1.9143099500000003,0" data-type="line" data-label="" points="330.93198472269955,332.6528972353812 322.4685083110733,332.6528972353812 322.4685083110733,341.11637364700744 253.54957777529776,341.11637364700744 253.54957777529776,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1,0 -1.325,0 -1.325,-0.1500000000000002 -1.9143099500000003,-0.1500000000000002 -1.9143099500000003,0" data-type="line" data-label="" points="330.93198472269955,332.6528972353812 303.42568638491423,332.6528972353812 303.42568638491423,345.3481118528206 253.54957777529776,345.3481118528206 253.54957777529776,332.6528972353812" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="1,0.1 1.9143099500000003,0.1" data-type="line" data-label="" points="500.20151295522464,324.189420823755 577.5839199026265,324.189420823755" fill="none" stroke="purple" stroke-width="1" />
@@ -191,7 +191,7 @@ x+" data-x="1" data-y="0.1" cx="500.20151295522464" cy="324.189420823755" r="3"
     <rect data-type="rect" data-label="schematic_component_4" data-x="0" data-y="0" x="330.93198472269955" y="298.7989915888762" width="169.2695282325251" height="67.70781129300997" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-1.4574283249999997" data-y="1.5274186000000005" x="283.75416992460123" y="184.33736239143013" width="16.926952823252577" height="38.08564385231816" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011815475714285715" />
+    <rect data-type="rect" data-label="" data-x="-3.0440232499999995" data-y="1.5274186000000005" x="149.47308269916704" y="184.33736239143013" width="16.92695282325252" height="38.08564385231816" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011815475714285715" />
   </g>
   <g>
     <rect data-type="rect" data-label="" data-x="-3.0434765500000003" data-y="-0.4250000000000004" x="149.51935252470935" y="349.5798500586337" width="16.926952823252492" height="38.085643852318185" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.011815475714285715" />

package/tests/examples/__snapshots__/example04.snap.svg

@@ -2,30 +2,30 @@
   <rect width="100%" height="100%" fill="white" />
   <g>
     <circle data-type="point" data-label="Q1.1
-y+" data-x="0.30397715550000004" data-y="0.5800832909999993" cx="390.7539406701768" cy="221.0795201051653" r="3" fill="hsl(315, 100%, 50%, 0.8)" />
+y+" data-x="0.30397715550000004" data-y="0.5800832909999993" cx="398.5713361931903" cy="210.15008622007596" r="3" fill="hsl(315, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="Q1.2
-y-" data-x="0.31067575550000137" data-y="-0.5800832909999993" cx="392.6200626292179" cy="544.283224583026" r="3" fill="hsl(316, 100%, 50%, 0.8)" />
+y-" data-x="0.31067575550000137" data-y="-0.5800832909999993" cx="400.643640497834" cy="569.0636206872589" r="3" fill="hsl(316, 100%, 50%, 0.8)" />
   </g>
   <g>
     <circle data-type="point" data-label="Q1.3
-x-" data-x="-0.4467558855000001" data-y="-0.10250625000000019" cx="181.61181945268248" cy="411.2379608945266" r="3" fill="hsl(317, 100%, 50%, 0.8)" />
+x-" data-x="-0.4467558855000001" data-y="-0.10250625000000019" cx="166.32171500335414" cy="421.31857577293414" r="3" fill="hsl(317, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="0.30397715550000004" data-y="0.7800832909999994" cx="390.7539406701768" cy="165.36274468819138" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="0.30397715550000004" data-y="0.6800832909999993" cx="398.5713361931903" cy="179.21370690733488" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <polyline data-points="0.30397715550000004,0.5800832909999993 0.31067575550000137,-0.5800832909999993" data-type="line" data-label="" points="390.7539406701768,221.0795201051653 392.6200626292179,544.283224583026" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
+    <polyline data-points="0.30397715550000004,0.5800832909999993 0.31067575550000137,-0.5800832909999993" data-type="line" data-label="" points="398.5713361931903,210.15008622007596 400.643640497834,569.0636206872589" fill="none" stroke="hsl(73, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="0.30397715550000004,0.5800832909999993 0.30397715550000004,0.7800832909999994 0.5467558855000001,0.7800832909999994 0.5467558855000001,-0.7800832909999995 0.31067575550000137,-0.7800832909999995 0.31067575550000137,-0.5800832909999993" data-type="line" data-label="" points="390.7539406701768,221.0795201051653 390.7539406701768,165.36274468819138 458.3881805473175,165.36274468819138 458.3881805473175,600 392.6200626292179,600 392.6200626292179,544.283224583026" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="0.30397715550000004,0.5800832909999993 0.30397715550000004,0.6800832909999993 0.5467558855000001,0.6800832909999993 0.5467558855000001,-0.6800832909999993 0.31067575550000137,-0.6800832909999993 0.31067575550000137,-0.5800832909999993" data-type="line" data-label="" points="398.5713361931903,210.15008622007596 398.5713361931903,179.21370690733488 473.67828499664586,179.21370690733488 473.67828499664586,600 400.643640497834,600 400.643640497834,569.0636206872589" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="181.61181945268248" y="221.0795201051653" width="248.9179733861481" height="323.2037044778607" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.003589583182142856" />
+    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="166.32171500335414" y="210.15008622007596" width="276.4201906805506" height="358.9135344671829" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0032324403249999975" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="0.30397715550000004" data-y="1.0050832909999994" x="362.8955529616899" y="40.000000000000114" width="55.71677541697386" height="125.36274468819127" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.003589583182142856" />
+    <rect data-type="rect" data-label="" data-x="0.30397715550000004" data-y="0.9050832909999993" x="367.6349568804492" y="40" width="61.87275862548216" height="139.21370690733488" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.0032324403249999975" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />
@@ -55,12 +55,12 @@ x-" data-x="-0.4467558855000001" data-y="-0.10250625000000019" cx="181.611819452
 
       // Calculate real coordinates using inverse transformation
       const matrix = {
-        "a": 278.58387708486947,
+        "a": 309.3637931274109,
         "c": 0,
-        "e": 306.07080614575653,
+        "e": 304.53181034362945,
         "b": 0,
-        "d": -278.58387708486947,
-        "f": 382.6813723440957
+        "d": -309.3637931274109,
+        "f": 389.60685345366744
       };
       // Manually invert and apply the affine transform
       // Since we only use translate and scale, we can directly compute: