circuit-to-svg 0.0.253 → 0.0.255

package/dist/index.js

@@ -627,7 +627,9 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     arrow_size,
     layer,
     pcb_component_id,
-    pcb_fabrication_note_dimension_id
+    pcb_fabrication_note_dimension_id,
+    offset_distance,
+    offset_direction
   } = dimension;
   if (layerFilter && layer && layer !== layerFilter) return [];
   if (!from || !to || typeof from !== "object" || typeof to !== "object") {
@@ -658,17 +660,30 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     return [];
   }
   const perpendicular = { x: -direction.y, y: direction.x };
+  const hasOffsetDirection = offset_direction && typeof offset_direction.x === "number" && typeof offset_direction.y === "number";
+  const normalizedOffsetDirection = hasOffsetDirection ? normalize({ x: offset_direction.x, y: offset_direction.y }) : { x: 0, y: 0 };
+  const offsetMagnitude = typeof offset_distance === "number" ? offset_distance : 0;
+  const offsetVector = {
+    x: normalizedOffsetDirection.x * offsetMagnitude,
+    y: normalizedOffsetDirection.y * offsetMagnitude
+  };
+  const applyOffset = (point) => ({
+    x: point.x + offsetVector.x,
+    y: point.y + offsetVector.y
+  });
+  const fromOffset = applyOffset(from);
+  const toOffset = applyOffset(to);
   const arrowHalfWidth = arrowSize / 2;
   const fromBase = {
-    x: from.x + direction.x * arrowSize,
-    y: from.y + direction.y * arrowSize
+    x: fromOffset.x + direction.x * arrowSize,
+    y: fromOffset.y + direction.y * arrowSize
   };
   const toBase = {
-    x: to.x - direction.x * arrowSize,
-    y: to.y - direction.y * arrowSize
+    x: toOffset.x - direction.x * arrowSize,
+    y: toOffset.y - direction.y * arrowSize
   };
   const fromTriangle = [
-    toScreen(from),
+    toScreen(fromOffset),
     toScreen({
       x: fromBase.x + perpendicular.x * arrowHalfWidth,
       y: fromBase.y + perpendicular.y * arrowHalfWidth
@@ -679,7 +694,7 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     })
   ];
   const toTriangle = [
-    toScreen(to),
+    toScreen(toOffset),
     toScreen({
       x: toBase.x + perpendicular.x * arrowHalfWidth,
       y: toBase.y + perpendicular.y * arrowHalfWidth
@@ -696,9 +711,34 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
   const [lineEndX, lineEndY] = applyToPoint6(transform, [toBase.x, toBase.y]);
   const strokeWidth = arrowSize / 5 * Math.abs(transform.a);
   const lineColor = color || "rgba(255,255,255,0.5)";
+  const extensionDirection = hasOffsetDirection && (Math.abs(normalizedOffsetDirection.x) > Number.EPSILON || Math.abs(normalizedOffsetDirection.y) > Number.EPSILON) ? normalizedOffsetDirection : perpendicular;
+  const extensionLength = offsetMagnitude + arrowSize;
+  const createExtensionLine = (anchor) => {
+    const endPoint = {
+      x: anchor.x + extensionDirection.x * extensionLength,
+      y: anchor.y + extensionDirection.y * extensionLength
+    };
+    const [startX, startY] = applyToPoint6(transform, [anchor.x, anchor.y]);
+    const [endX, endY] = applyToPoint6(transform, [endPoint.x, endPoint.y]);
+    return {
+      name: "path",
+      type: "element",
+      value: "",
+      attributes: {
+        d: `M ${startX} ${startY} L ${endX} ${endY}`,
+        stroke: lineColor,
+        fill: "none",
+        "stroke-width": strokeWidth.toString(),
+        "stroke-linecap": "round",
+        class: "pcb-fabrication-note-dimension-extension"
+      },
+      children: []
+    };
+  };
+  const extensionSegments = [createExtensionLine(from), createExtensionLine(to)];
   const midPoint = {
-    x: (from.x + to.x) / 2,
-    y: (from.y + to.y) / 2
+    x: (from.x + to.x) / 2 + offsetVector.x,
+    y: (from.y + to.y) / 2 + offsetVector.y
   };
   const textOffset = arrowSize * 1.5;
   const textPoint = {
@@ -706,8 +746,25 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
     y: midPoint.y + perpendicular.y * textOffset
   };
   const [textX, textY] = applyToPoint6(transform, [textPoint.x, textPoint.y]);
+  const [screenFromX, screenFromY] = applyToPoint6(transform, [
+    fromOffset.x,
+    fromOffset.y
+  ]);
+  const [screenToX, screenToY] = applyToPoint6(transform, [
+    toOffset.x,
+    toOffset.y
+  ]);
+  const screenDirection = normalize({
+    x: screenToX - screenFromX,
+    y: screenToY - screenFromY
+  });
+  let textAngle = Math.atan2(screenDirection.y, screenDirection.x) * 180 / Math.PI;
+  if (textAngle > 90 || textAngle < -90) {
+    textAngle += 180;
+  }
   const transformedFontSize = font_size * Math.abs(transform.a);
   const children = [
+    ...extensionSegments,
     {
       name: "path",
       type: "element",
@@ -758,7 +815,8 @@ function createSvgObjectsFromPcbFabricationNoteDimension(dimension, ctx) {
         "font-family": "Arial, sans-serif",
         "text-anchor": "middle",
         "dominant-baseline": "central",
-        class: "pcb-fabrication-note-dimension-text"
+        class: "pcb-fabrication-note-dimension-text",
+        transform: `rotate(${textAngle} ${textX} ${textY})`
       },
       children: [
         {
@@ -1049,7 +1107,16 @@ function toPath2(points) {
 }
 function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
   const { transform } = ctx;
-  const { from, to, text, font_size = 1, color, arrow_size } = dimension;
+  const {
+    from,
+    to,
+    text,
+    font_size = 1,
+    color,
+    arrow_size,
+    offset_distance,
+    offset_direction
+  } = dimension;
   if (!from || !to) {
     console.error("Invalid pcb_note_dimension endpoints", { from, to });
     return [];
@@ -1063,17 +1130,30 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
     return [];
   }
   const perpendicular = { x: -direction.y, y: direction.x };
+  const hasOffsetDirection = offset_direction && typeof offset_direction.x === "number" && typeof offset_direction.y === "number";
+  const normalizedOffsetDirection = hasOffsetDirection ? normalize2({ x: offset_direction.x, y: offset_direction.y }) : { x: 0, y: 0 };
+  const offsetMagnitude = typeof offset_distance === "number" ? offset_distance : 0;
+  const offsetVector = {
+    x: normalizedOffsetDirection.x * offsetMagnitude,
+    y: normalizedOffsetDirection.y * offsetMagnitude
+  };
+  const applyOffset = (point) => ({
+    x: point.x + offsetVector.x,
+    y: point.y + offsetVector.y
+  });
+  const fromOffset = applyOffset(from);
+  const toOffset = applyOffset(to);
   const arrowHalfWidth = arrow_size / 2;
   const fromBase = {
-    x: from.x + direction.x * arrow_size,
-    y: from.y + direction.y * arrow_size
+    x: fromOffset.x + direction.x * arrow_size,
+    y: fromOffset.y + direction.y * arrow_size
   };
   const toBase = {
-    x: to.x - direction.x * arrow_size,
-    y: to.y - direction.y * arrow_size
+    x: toOffset.x - direction.x * arrow_size,
+    y: toOffset.y - direction.y * arrow_size
   };
   const fromTriangle = [
-    toScreen(from),
+    toScreen(fromOffset),
     toScreen({
       x: fromBase.x + perpendicular.x * arrowHalfWidth,
       y: fromBase.y + perpendicular.y * arrowHalfWidth
@@ -1084,7 +1164,7 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
     })
   ];
   const toTriangle = [
-    toScreen(to),
+    toScreen(toOffset),
     toScreen({
       x: toBase.x + perpendicular.x * arrowHalfWidth,
       y: toBase.y + perpendicular.y * arrowHalfWidth
@@ -1101,9 +1181,34 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
   const [lineEndX, lineEndY] = applyToPoint7(transform, [toBase.x, toBase.y]);
   const strokeWidth = arrow_size / 5 * Math.abs(transform.a);
   const lineColor = color || colorMap.board.user_2;
+  const extensionDirection = hasOffsetDirection && (Math.abs(normalizedOffsetDirection.x) > Number.EPSILON || Math.abs(normalizedOffsetDirection.y) > Number.EPSILON) ? normalizedOffsetDirection : perpendicular;
+  const extensionLength = offsetMagnitude + arrow_size;
+  const createExtensionLine = (anchor) => {
+    const endPoint = {
+      x: anchor.x + extensionDirection.x * extensionLength,
+      y: anchor.y + extensionDirection.y * extensionLength
+    };
+    const [startX, startY] = applyToPoint7(transform, [anchor.x, anchor.y]);
+    const [endX, endY] = applyToPoint7(transform, [endPoint.x, endPoint.y]);
+    return {
+      name: "path",
+      type: "element",
+      value: "",
+      attributes: {
+        d: `M ${startX} ${startY} L ${endX} ${endY}`,
+        stroke: lineColor,
+        fill: "none",
+        "stroke-width": strokeWidth.toString(),
+        "stroke-linecap": "round",
+        class: "pcb-note-dimension-extension"
+      },
+      children: []
+    };
+  };
+  const extensionSegments = [createExtensionLine(from), createExtensionLine(to)];
   const midPoint = {
-    x: (from.x + to.x) / 2,
-    y: (from.y + to.y) / 2
+    x: (from.x + to.x) / 2 + offsetVector.x,
+    y: (from.y + to.y) / 2 + offsetVector.y
   };
   const textOffset = arrow_size * 1.5;
   const textPoint = {
@@ -1111,8 +1216,25 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
     y: midPoint.y + perpendicular.y * textOffset
   };
   const [textX, textY] = applyToPoint7(transform, [textPoint.x, textPoint.y]);
+  const [screenFromX, screenFromY] = applyToPoint7(transform, [
+    fromOffset.x,
+    fromOffset.y
+  ]);
+  const [screenToX, screenToY] = applyToPoint7(transform, [
+    toOffset.x,
+    toOffset.y
+  ]);
+  const screenDirection = normalize2({
+    x: screenToX - screenFromX,
+    y: screenToY - screenFromY
+  });
+  let textAngle = Math.atan2(screenDirection.y, screenDirection.x) * 180 / Math.PI;
+  if (textAngle > 90 || textAngle < -90) {
+    textAngle += 180;
+  }
   const transformedFontSize = font_size * Math.abs(transform.a);
   const children = [
+    ...extensionSegments,
     {
       name: "path",
       type: "element",
@@ -1163,7 +1285,8 @@ function createSvgObjectsFromPcbNoteDimension(dimension, ctx) {
         "font-family": "Arial, sans-serif",
         "text-anchor": "middle",
         "dominant-baseline": "central",
-        class: "pcb-note-dimension-text"
+        class: "pcb-note-dimension-text",
+        transform: `rotate(${textAngle} ${textX} ${textY})`
       },
       children: [
         {
@@ -1444,14 +1567,23 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
     const scaledOuterHeight = hole.outer_height * Math.abs(transform.a);
     const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const outerRadiusX = scaledOuterWidth / 2;
-    const outerRadiusY = scaledOuterHeight / 2;
-    const innerRadiusX = scaledHoleWidth / 2;
-    const innerRadiusY = scaledHoleHeight / 2;
-    const straightLength = scaledOuterHeight - scaledOuterWidth;
     const rotation = hole.ccw_rotation || 0;
     const outerTransform = rotation ? `translate(${x} ${y}) rotate(${-rotation})` : `translate(${x} ${y})`;
     const innerTransform = rotation ? `translate(${x} ${y}) rotate(${-rotation})` : `translate(${x} ${y})`;
+    const createPillPath = (width, height) => {
+      if (width > height) {
+        const radius = height / 2;
+        const straightLength = width - 2 * radius;
+        return `M${-width / 2 + radius},${-radius} h${straightLength} a${radius},${radius} 0 0 1 0,${height} h${-straightLength} a${radius},${radius} 0 0 1 0,${-height} z`;
+      } else if (height > width) {
+        const radius = width / 2;
+        const straightLength = height - 2 * radius;
+        return `M${radius},${-height / 2 + radius} v${straightLength} a${radius},${radius} 0 0 1 ${-width},0 v${-straightLength} a${radius},${radius} 0 0 1 ${width},0 z`;
+      } else {
+        const radius = width / 2;
+        return `M${-radius},0 a${radius},${radius} 0 0 1 ${width},0 a${radius},${radius} 0 0 1 ${-width},0 z`;
+      }
+    };
     return [
       {
         name: "g",
@@ -1468,7 +1600,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             attributes: {
               class: "pcb-hole-outer",
               fill: colorMap2.copper.top,
-              d: `M${-outerRadiusX},${-straightLength / 2} v${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 ${scaledOuterWidth},0 v-${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 -${scaledOuterWidth},0 z`,
+              d: createPillPath(scaledOuterWidth, scaledOuterHeight),
               transform: outerTransform,
               "data-type": "pcb_plated_hole",
               "data-pcb-layer": copperLayer
@@ -1483,7 +1615,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             attributes: {
               class: "pcb-hole-inner",
               fill: colorMap2.drill,
-              d: `M${-innerRadiusX},${-(scaledHoleHeight - scaledHoleWidth) / 2} v${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 ${scaledHoleWidth},0 v-${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 -${scaledHoleWidth},0 z`,
+              d: createPillPath(scaledHoleWidth, scaledHoleHeight),
               transform: innerTransform,
               "data-type": "pcb_plated_hole_drill",
               "data-pcb-layer": "drill"
@@ -3339,7 +3471,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.252",
+  version: "0.0.254",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3363,7 +3495,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.288",
+    "circuit-json": "^0.0.292",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",