circuit-to-svg 0.0.110 → 0.0.112

package/dist/index.js

@@ -3,7 +3,7 @@ import { stringify } from "svgson";
 import {
   applyToPoint as applyToPoint16,
   compose as compose3,
-  scale,
+  scale as scale2,
   translate as translate3
 } from "transformation-matrix";
 
@@ -288,11 +288,63 @@ 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 [];
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-path.ts
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+
+// lib/pcb/colors.ts
+var HOLE_COLOR = "#FF26E2";
+var SILKSCREEN_TOP_COLOR = "#f2eda1";
+var SILKSCREEN_BOTTOM_COLOR = "#5da9e9";
+
+// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-path.ts
 function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, transform) {
   if (!silkscreenPath.route || !Array.isArray(silkscreenPath.route)) return [];
   let path = silkscreenPath.route.map((point, index) => {
@@ -304,15 +356,17 @@ function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, transform) {
   if (firstPoint && lastPoint && firstPoint.x === lastPoint.x && firstPoint.y === lastPoint.y) {
     path += " Z";
   }
+  const layer = silkscreenPath.layer || "top";
+  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   return [
     {
       name: "path",
       type: "element",
       attributes: {
-        class: `pcb-silkscreen pcb-silkscreen-${silkscreenPath.layer}`,
+        class: `pcb-silkscreen pcb-silkscreen-${layer}`,
         d: path,
         fill: "none",
-        stroke: "#f2eda1",
+        stroke: color,
         "stroke-width": (silkscreenPath.stroke_width * Math.abs(transform.a)).toString(),
         "data-pcb-component-id": silkscreenPath.pcb_component_id,
         "data-pcb-silkscreen-path-id": silkscreenPath.pcb_silkscreen_path_id
@@ -329,6 +383,7 @@ import {
   compose as compose2,
   rotate as rotate2,
   translate as translate2,
+  scale,
   toString as matrixToString2
 } from "transformation-matrix";
 function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
@@ -352,15 +407,17 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const textTransform = compose2(
     translate2(transformedX, transformedY),
-    rotate2(ccw_rotation * Math.PI / 180)
+    rotate2(ccw_rotation * Math.PI / 180),
+    ...layer === "bottom" ? [scale(-1, 1)] : []
   );
+  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   const svgObject = {
     name: "text",
     type: "element",
     attributes: {
       x: "0",
       y: "0",
-      fill: "#f2eda1",
+      fill: color,
       "font-family": "Arial, sans-serif",
       "font-size": transformedFontSize.toString(),
       "text-anchor": "middle",
@@ -368,7 +425,7 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
       transform: matrixToString2(textTransform),
       class: `pcb-silkscreen-text pcb-silkscreen-${layer}`,
       "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id,
-      stroke: "#f2eda1",
+      stroke: color,
       "stroke-width": transformedStrokeWidth.toString()
     },
     children: [
@@ -409,6 +466,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 color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   const svgObject = {
     name: "rect",
     type: "element",
@@ -419,7 +477,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
       height: transformedHeight.toString(),
       class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
       fill: "none",
-      stroke: "#f2eda1",
+      stroke: color,
       "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
     },
@@ -451,6 +509,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
   ]);
   const transformedRadius = radius * Math.abs(transform.a);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
+  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   const svgObject = {
     name: "circle",
     type: "element",
@@ -459,7 +518,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
       cy: transformedY.toString(),
       r: transformedRadius.toString(),
       class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
-      stroke: "#f2eda1",
+      stroke: color,
       "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
     },
@@ -490,6 +549,7 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
   const [transformedX1, transformedY1] = applyToPoint9(transform, [x1, y1]);
   const [transformedX2, transformedY2] = applyToPoint9(transform, [x2, y2]);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
+  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   return [
     {
       name: "line",
@@ -499,7 +559,7 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
         y1: transformedY1.toString(),
         x2: transformedX2.toString(),
         y2: transformedY2.toString(),
-        stroke: "#f2eda1",
+        stroke: color,
         "stroke-width": transformedStrokeWidth.toString(),
         class: `pcb-silkscreen-line pcb-silkscreen-${layer}`,
         "data-pcb-silkscreen-line-id": pcb_silkscreen_line_id
@@ -731,11 +791,6 @@ function createSvgObjectsFromPcbVia(hole, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 import { applyToPoint as applyToPoint14 } from "transformation-matrix";
-
-// lib/pcb/colors.ts
-var HOLE_COLOR = "#FF26E2";
-
-// lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 function createSvgObjectsFromPcbHole(hole, transform) {
   const [x, y] = applyToPoint14(transform, [hole.x, hole.y]);
   if (hole.hole_shape === "circle" || hole.hole_shape === "square") {
@@ -966,7 +1021,7 @@ function convertCircuitJsonToPcbSvg(soup, options) {
       offsetX - minX * scaleFactor + padding * scaleFactor,
       svgHeight - offsetY + minY * scaleFactor - padding * scaleFactor
     ),
-    scale(scaleFactor, -scaleFactor)
+    scale2(scaleFactor, -scaleFactor)
     // Flip in y-direction
   );
   let svgObjects = soup.sort(
@@ -1175,7 +1230,7 @@ import { su as su3 } from "@tscircuit/soup-util";
 import {
   applyToPoint as applyToPoint20,
   compose as compose4,
-  scale as scale2,
+  scale as scale3,
   translate as translate4
 } from "transformation-matrix";
 
@@ -1294,9 +1349,9 @@ function createComponentPath(scaledWidth, scaledHeight, centerX, centerY, pinX,
   };
 }
 function createComponentLabel(scaledWidth, scaledHeight, name, transform) {
-  const scale7 = Math.min(scaledWidth, scaledHeight) * 0.4;
-  const fontSize = getSchScreenFontSize(transform, "net_label") * (scale7 / 2.5);
-  const scaledFontSize = scale7 < 25 ? fontSize : fontSize * 0.6;
+  const scale8 = Math.min(scaledWidth, scaledHeight) * 0.4;
+  const fontSize = getSchScreenFontSize(transform, "net_label") * (scale8 / 2.5);
+  const scaledFontSize = scale8 < 25 ? fontSize : fontSize * 0.6;
   return {
     name: "text",
     type: "element",
@@ -1400,7 +1455,7 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
       offsetX - minX * scaleFactor + padding * scaleFactor,
       svgHeight - offsetY + minY * scaleFactor - padding * scaleFactor
     ),
-    scale2(scaleFactor, -scaleFactor)
+    scale3(scaleFactor, -scaleFactor)
     // Flip in y-direction
   );
   const svgObjects = soup.sort(
@@ -2034,7 +2089,7 @@ var matchSchPortsToSymbolPorts = ({
 };
 
 // lib/utils/point-pairs-to-matrix.ts
-import { compose as compose5, scale as scale3, translate as translate5 } from "transformation-matrix";
+import { compose as compose5, scale as scale4, translate as translate5 } from "transformation-matrix";
 function pointPairsToMatrix(a1, a2, b1, b2) {
   const tx = a2.x - a1.x;
   const ty = a2.y - a1.y;
@@ -2042,7 +2097,7 @@ function pointPairsToMatrix(a1, a2, b1, b2) {
   const transformedDistance = Math.sqrt((b2.x - a2.x) ** 2 + (b2.y - a2.y) ** 2);
   const a = transformedDistance / originalDistance;
   const translateMatrix = translate5(tx, ty);
-  const scaleMatrix = scale3(a, a);
+  const scaleMatrix = scale4(a, a);
   return compose5(translateMatrix, scaleMatrix);
 }
 
@@ -2944,7 +2999,7 @@ import {
   applyToPoint as applyToPoint35,
   compose as compose8,
   rotate as rotate4,
-  scale as scale5,
+  scale as scale6,
   translate as translate8
 } from "transformation-matrix";
 
@@ -3732,7 +3787,7 @@ import {
   applyToPoint as applyToPoint34,
   compose as compose7,
   rotate as rotate3,
-  scale as scale4,
+  scale as scale5,
   translate as translate7
 } from "transformation-matrix";
 import { symbols as symbols3 } from "schematic-symbols";
@@ -3766,8 +3821,8 @@ var ninePointAnchorToDominantBaseline = {
   middle_bottom: "hanging"
 };
 function getTextOffsets(pathRotation, transform) {
-  const scale7 = Math.abs(transform.a);
-  const baseOffset = scale7 * 0.1;
+  const scale8 = Math.abs(transform.a);
+  const baseOffset = scale8 * 0.1;
   const rotationOffsetMap = {
     "0": { x: baseOffset * 0.8, y: -baseOffset },
     // Left
@@ -3856,7 +3911,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
       realAnchorPosition.y - rotatedSymbolEnd.y
     ),
     rotationMatrix,
-    scale4(1)
+    scale5(1)
     // Use full symbol size
   );
   const [screenMinX, screenMinY] = applyToPoint34(
@@ -3917,8 +3972,8 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     } else if (textValue === "{VAL}") {
       textValue = "";
     }
-    const scale7 = Math.abs(realToScreenTransform.a);
-    const baseOffset = scale7 * 0.1;
+    const scale8 = Math.abs(realToScreenTransform.a);
+    const baseOffset = scale8 * 0.1;
     const rotationOffset = getTextOffsets(pathRotation, realToScreenTransform);
     const offsetScreenPos = {
       x: screenTextPos.x + rotationOffset.x,
@@ -4063,7 +4118,7 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
       compose8(
         realToScreenTransform,
         translate8(realAnchorPosition.x, realAnchorPosition.y),
-        scale5(fontSizeMm),
+        scale6(fontSizeMm),
         rotate4(pathRotation / 180 * Math.PI)
       ),
       fontRelativePoint