circuit-to-svg 0.0.295 → 0.0.297

package/dist/index.js

@@ -2751,12 +2751,13 @@ var CHAR_WIDTH = 1;
 var CHAR_SPACING = 0.2;
 var LINE_HEIGHT = 1.4;
 var FONT_SCALE = 0.53;
-function linesToPathData(lines, offsetX, offsetY, charScale) {
+var BASELINE_Y = 0.241;
+function linesToPathData(lines, offsetX, offsetY, charScale, baselineAdjust = 0) {
   return lines.map((line) => {
     const x1 = offsetX + line.x1 * charScale;
-    const y1 = offsetY + (1 - line.y1) * charScale;
+    const y1 = offsetY + (1 - line.y1 + baselineAdjust) * charScale;
     const x2 = offsetX + line.x2 * charScale;
-    const y2 = offsetY + (1 - line.y2) * charScale;
+    const y2 = offsetY + (1 - line.y2 + baselineAdjust) * charScale;
     return `M${x1} ${y1}L${x2} ${y2}`;
   }).join(" ");
 }
@@ -2771,7 +2772,9 @@ function textToAlphabetPath(text, fontSize) {
     }
     const lines = lineAlphabet[char];
     if (lines) {
-      paths.push(linesToPathData(lines, x, 0, fontSize));
+      const isLowercase = char >= "a" && char <= "z";
+      const baselineAdjust = isLowercase ? BASELINE_Y : 0;
+      paths.push(linesToPathData(lines, x, 0, fontSize, baselineAdjust));
     }
     x += charAdvance;
   }
@@ -2804,7 +2807,9 @@ function textToCenteredAlphabetPaths(text, fontSize) {
       }
       const charLines = lineAlphabet[char];
       if (charLines) {
-        paths.push(linesToPathData(charLines, x, y, fontSize));
+        const isLowercase = char >= "a" && char <= "z";
+        const baselineAdjust = isLowercase ? BASELINE_Y : 0;
+        paths.push(linesToPathData(charLines, x, y, fontSize, baselineAdjust));
       }
       x += charAdvance;
     }
@@ -2875,7 +2880,6 @@ function createSvgObjectsFromPcbCopperText(pcbCopperText, ctx) {
               id: maskId
             },
             children: [
-              // White background - area that will show copper
               {
                 name: "rect",
                 type: "element",
@@ -2889,7 +2893,6 @@ function createSvgObjectsFromPcbCopperText(pcbCopperText, ctx) {
                 },
                 children: []
               },
-              // Black text strokes - area that will be cut out
               {
                 name: "path",
                 type: "element",
@@ -3774,13 +3777,17 @@ import { applyToPoint as applyToPoint23 } from "transformation-matrix";
 
 // lib/utils/create-pcb-component-anchor-offset-indicators.ts
 import { applyToPoint as applyToPoint22 } from "transformation-matrix";
-var OFFSET_THRESHOLD_MM = 0.01;
+var OFFSET_THRESHOLD_MM = 0.05;
 var TICK_SIZE_PX = 4;
 var LABEL_GAP_PX = 8;
 var LABEL_FONT_SIZE_PX = 11;
 var STROKE_WIDTH_PX = 1;
 var ANCHOR_MARKER_SIZE_PX = 5;
 var ANCHOR_MARKER_STROKE_WIDTH_PX = 1.5;
+var COMPONENT_ANCHOR_MARKER_RADIUS_PX = 2;
+var CONNECTOR_GROUP_GAP_PX = ANCHOR_MARKER_SIZE_PX + 2;
+var CONNECTOR_COMPONENT_GAP_PX = COMPONENT_ANCHOR_MARKER_RADIUS_PX + 2;
+var DIMENSION_ANCHOR_CLEARANCE_PX = ANCHOR_MARKER_SIZE_PX + TICK_SIZE_PX + 6;
 var COMPONENT_GAP_PX = 15;
 var COMPONENT_SIDE_GAP_PX = 10;
 var DISTANCE_MULTIPLIER = 0.2;
@@ -3810,14 +3817,20 @@ function createAnchorOffsetIndicators(params) {
   const screenComponentWidth = componentWidth * scale10;
   const screenComponentHeight = componentHeight * scale10;
   objects.push(createAnchorMarker(screenGroupAnchorX, screenGroupAnchorY));
+  const trimmedConnector = getTrimmedConnectorLine(
+    screenGroupAnchorX,
+    screenGroupAnchorY,
+    screenComponentX,
+    screenComponentY
+  );
   objects.push({
     name: "line",
     type: "element",
     attributes: {
-      x1: screenGroupAnchorX.toString(),
-      y1: screenGroupAnchorY.toString(),
-      x2: screenComponentX.toString(),
-      y2: screenComponentY.toString(),
+      x1: trimmedConnector.x1.toString(),
+      y1: trimmedConnector.y1.toString(),
+      x2: trimmedConnector.x2.toString(),
+      y2: trimmedConnector.y2.toString(),
       stroke: "#ffffff",
       "stroke-width": "0.5",
       "stroke-dasharray": "3,3",
@@ -3833,7 +3846,7 @@ function createAnchorOffsetIndicators(params) {
     attributes: {
       cx: screenComponentX.toString(),
       cy: screenComponentY.toString(),
-      r: "2",
+      r: COMPONENT_ANCHOR_MARKER_RADIUS_PX.toString(),
       fill: "#ffffff",
       opacity: "0.7",
       class: "anchor-offset-component-marker"
@@ -3849,9 +3862,23 @@ function createAnchorOffsetIndicators(params) {
     componentHeightOffset,
     Math.min(MAX_OFFSET_PX, totalDistance * DISTANCE_MULTIPLIER)
   );
-  const horizontalLineY = offsetY > 0 ? screenComponentY - dynamicOffset : screenComponentY + dynamicOffset;
+  let horizontalLineY = offsetY > 0 ? screenComponentY - dynamicOffset : screenComponentY + dynamicOffset;
   const componentWidthOffset = screenComponentWidth / 2 + COMPONENT_SIDE_GAP_PX;
-  const verticalLineX = offsetX > 0 ? screenComponentX + componentWidthOffset : screenComponentX - componentWidthOffset;
+  let verticalLineX = offsetX > 0 ? screenComponentX + componentWidthOffset : screenComponentX - componentWidthOffset;
+  if (isTooCloseToAnchor(horizontalLineY, screenGroupAnchorY) || isTooCloseToAnchor(horizontalLineY, screenComponentY)) {
+    const minY = Math.min(screenGroupAnchorY, screenComponentY);
+    const maxY = Math.max(screenGroupAnchorY, screenComponentY);
+    const candidateAbove = minY - DIMENSION_ANCHOR_CLEARANCE_PX;
+    const candidateBelow = maxY + DIMENSION_ANCHOR_CLEARANCE_PX;
+    horizontalLineY = Math.abs(horizontalLineY - candidateAbove) < Math.abs(horizontalLineY - candidateBelow) ? candidateAbove : candidateBelow;
+  }
+  if (isTooCloseToAnchor(verticalLineX, screenGroupAnchorX) || isTooCloseToAnchor(verticalLineX, screenComponentX)) {
+    const minX = Math.min(screenGroupAnchorX, screenComponentX);
+    const maxX = Math.max(screenGroupAnchorX, screenComponentX);
+    const candidateLeft = minX - DIMENSION_ANCHOR_CLEARANCE_PX;
+    const candidateRight = maxX + DIMENSION_ANCHOR_CLEARANCE_PX;
+    verticalLineX = Math.abs(verticalLineX - candidateLeft) < Math.abs(verticalLineX - candidateRight) ? candidateLeft : candidateRight;
+  }
   if (Math.abs(offsetX) > OFFSET_THRESHOLD_MM) {
     objects.push(
       ...createHorizontalDimension({
@@ -3878,6 +3905,24 @@ function createAnchorOffsetIndicators(params) {
   }
   return objects;
 }
+function getTrimmedConnectorLine(x1, y1, x2, y2) {
+  const dx = x2 - x1;
+  const dy = y2 - y1;
+  const distance4 = Math.hypot(dx, dy);
+  const totalTrim = CONNECTOR_GROUP_GAP_PX + CONNECTOR_COMPONENT_GAP_PX;
+  if (!(distance4 > totalTrim)) return { x1, y1, x2, y2 };
+  const ux = dx / distance4;
+  const uy = dy / distance4;
+  return {
+    x1: x1 + ux * CONNECTOR_GROUP_GAP_PX,
+    y1: y1 + uy * CONNECTOR_GROUP_GAP_PX,
+    x2: x2 - ux * CONNECTOR_COMPONENT_GAP_PX,
+    y2: y2 - uy * CONNECTOR_COMPONENT_GAP_PX
+  };
+}
+function isTooCloseToAnchor(value, anchorValue) {
+  return Math.abs(value - anchorValue) < DIMENSION_ANCHOR_CLEARANCE_PX;
+}
 function createAnchorMarker(x, y) {
   return {
     name: "g",
@@ -4082,8 +4127,7 @@ function createVerticalDimension({
   return objects;
 }
 function formatOffsetLabel(axis, offsetMm, displayOffset) {
-  const baseValue = displayOffset ?? offsetMm.toFixed(2);
-  const valueStr = typeof baseValue === "number" ? baseValue.toString() : baseValue;
+  const valueStr = typeof displayOffset === "string" ? displayOffset : offsetMm.toFixed(2);
   const hasUnit = typeof valueStr === "string" && valueStr.trim().endsWith("mm");
   const unitSuffix = hasUnit ? "" : "mm";
   return `${axis}: ${valueStr}${unitSuffix}`;
@@ -5368,6 +5412,17 @@ function createMajorGridPatternChildren(cellSize, majorCellSize, lineColor, majo
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-component.ts
 import { applyToPoint as applyToPoint31 } from "transformation-matrix";
+
+// lib/utils/get-point-from-elm.ts
+function getPointFromElm(elm) {
+  const candidate = elm?.anchor_position ?? elm?.center;
+  if (candidate && typeof candidate.x === "number" && typeof candidate.y === "number") {
+    return { x: candidate.x, y: candidate.y };
+  }
+  return void 0;
+}
+
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-component.ts
 function createSvgObjectsFromPcbComponent(component, ctx) {
   const { transform, circuitJson } = ctx;
   const { center, width, height, rotation = 0 } = component;
@@ -5429,13 +5484,15 @@ function getAnchorPosition(component, circuitJson) {
     const pcbGroup = circuitJson.find(
       (elm) => elm.type === "pcb_group" && elm.pcb_group_id === component.positioned_relative_to_pcb_group_id
     );
-    if (pcbGroup?.center) return pcbGroup.center;
+    const point = getPointFromElm(pcbGroup);
+    if (point) return point;
   }
   if (component.positioned_relative_to_pcb_board_id) {
     const pcbBoard = circuitJson.find(
       (elm) => elm.type === "pcb_board" && elm.pcb_board_id === component.positioned_relative_to_pcb_board_id
     );
-    if (pcbBoard?.center) return pcbBoard.center;
+    const point = getPointFromElm(pcbBoard);
+    if (point) return point;
   }
   return void 0;
 }
@@ -5454,7 +5511,7 @@ function createSvgObjectsFromPcbGroup(pcbGroup, ctx) {
       svgObjects.push(
         ...createAnchorOffsetIndicators({
           groupAnchorPosition: anchorPosition,
-          componentPosition: pcbGroup.center,
+          componentPosition: pcbGroup.anchor_position ?? pcbGroup.center,
           transform,
           componentWidth: pcbGroup.width,
           componentHeight: pcbGroup.height,
@@ -5539,13 +5596,15 @@ function getAnchorPosition2(group, circuitJson) {
     const pcbGroup = circuitJson.find(
       (elm) => elm.type === "pcb_group" && elm.pcb_group_id === group.positioned_relative_to_pcb_group_id
     );
-    if (pcbGroup?.center) return pcbGroup.center;
+    const point = getPointFromElm(pcbGroup);
+    if (point) return point;
   }
   if (group.positioned_relative_to_pcb_board_id) {
     const pcbBoard = circuitJson.find(
       (elm) => elm.type === "pcb_board" && elm.pcb_board_id === group.positioned_relative_to_pcb_board_id
     );
-    if (pcbBoard?.center) return pcbBoard.center;
+    const point = getPointFromElm(pcbBoard);
+    if (point) return point;
   }
   return void 0;
 }
@@ -5562,7 +5621,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.294",
+  version: "0.0.296",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [