circuit-to-svg 0.0.109 → 0.0.111

package/dist/index.js

@@ -288,6 +288,51 @@ function createSvgObjectsFromPcbPlatedHole(hole, transform) {
       }
     ];
   }
+  if (hole.shape === "circular_hole_with_rect_pad") {
+    const scaledHoleDiameter = hole.hole_diameter * Math.abs(transform.a);
+    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
+    const holeRadius = scaledHoleDiameter / 2;
+    return [
+      {
+        name: "g",
+        type: "element",
+        children: [
+          // Rectangular pad (outer shape)
+          {
+            name: "rect",
+            type: "element",
+            attributes: {
+              class: "pcb-hole-outer-pad",
+              fill: "rgb(200, 52, 52)",
+              x: (x - scaledRectPadWidth / 2).toString(),
+              y: (y - scaledRectPadHeight / 2).toString(),
+              width: scaledRectPadWidth.toString(),
+              height: scaledRectPadHeight.toString()
+            },
+            value: "",
+            children: []
+          },
+          // Circular hole inside the rectangle
+          {
+            name: "circle",
+            type: "element",
+            attributes: {
+              class: "pcb-hole-inner",
+              fill: "rgb(255, 38, 226)",
+              cx: x.toString(),
+              cy: y.toString(),
+              r: holeRadius.toString()
+            },
+            value: "",
+            children: []
+          }
+        ],
+        value: "",
+        attributes: {}
+      }
+    ];
+  }
   return [];
 }
 
@@ -337,7 +382,8 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     text,
     font_size = 1,
     layer = "top",
-    ccw_rotation = 0
+    ccw_rotation = 0,
+    stroke_width = 0
   } = pcbSilkscreenText;
   if (!anchor_position || typeof anchor_position.x !== "number" || typeof anchor_position.y !== "number") {
     console.error("Invalid anchor_position:", anchor_position);
@@ -348,10 +394,10 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     anchor_position.y
   ]);
   const transformedFontSize = font_size * Math.abs(transform.a);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const textTransform = compose2(
     translate2(transformedX, transformedY),
     rotate2(ccw_rotation * Math.PI / 180)
-    // Convert degrees to radians
   );
   const svgObject = {
     name: "text",
@@ -366,7 +412,9 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
       "dominant-baseline": "central",
       transform: matrixToString2(textTransform),
       class: `pcb-silkscreen-text pcb-silkscreen-${layer}`,
-      "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id
+      "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id,
+      stroke: "#f2eda1",
+      "stroke-width": transformedStrokeWidth.toString()
     },
     children: [
       {
@@ -392,7 +440,8 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
     width,
     height,
     layer = "top",
-    pcb_silkscreen_rect_id
+    pcb_silkscreen_rect_id,
+    stroke_width = 1
   } = pcbSilkscreenRect;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
     console.error("Invalid rectangle data:", { center, width, height });
@@ -404,6 +453,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
   ]);
   const transformedWidth = width * Math.abs(transform.a);
   const transformedHeight = height * Math.abs(transform.d);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const svgObject = {
     name: "rect",
     type: "element",
@@ -415,7 +465,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
       class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
       fill: "none",
       stroke: "#f2eda1",
-      "stroke-width": "1",
+      "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
     },
     value: "",
@@ -433,7 +483,8 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     center,
     radius,
     layer = "top",
-    pcb_silkscreen_circle_id
+    pcb_silkscreen_circle_id,
+    stroke_width = 1
   } = pcbSilkscreenCircle;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof radius !== "number") {
     console.error("Invalid PCB Silkscreen Circle data:", { center, radius });
@@ -444,6 +495,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     center.y
   ]);
   const transformedRadius = radius * Math.abs(transform.a);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const svgObject = {
     name: "circle",
     type: "element",
@@ -453,7 +505,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
       r: transformedRadius.toString(),
       class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
       stroke: "#f2eda1",
-      "stroke-width": "1",
+      "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
     },
     value: "",
@@ -1899,7 +1951,7 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
   const portSize = 0.2;
   for (const item of soup) {
     if (item.type === "schematic_component") {
-      updateBounds(item.center, item.size, item.rotation || 0);
+      updateBounds(item.center, item.size, 0);
     } else if (item.type === "schematic_port") {
       updateBounds(item.center, { width: portSize, height: portSize }, 0);
     } else if (item.type === "schematic_debug_object") {