circuit-to-svg 0.0.313 → 0.0.315

package/dist/index.js

@@ -3405,6 +3405,14 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     const [x, y] = applyToPoint24(transform, [pad.x, pad.y]);
     const cornerRadiusValue = pad.corner_radius ?? pad.rect_border_radius ?? 0;
     const scaledBorderRadius = cornerRadiusValue * Math.abs(transform.a);
+    const m = {
+      left: (pad.soldermask_margin_left ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      right: (pad.soldermask_margin_right ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      top: (pad.soldermask_margin_top ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      bottom: (pad.soldermask_margin_bottom ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a)
+    };
+    const isNegativeMargin = m.left < 0 || m.right < 0 || m.top < 0 || m.bottom < 0;
+    const isZeroMargin = m.left === 0 && m.right === 0 && m.top === 0 && m.bottom === 0;
     if (pad.shape === "rotated_rect" && pad.ccw_rotation) {
       const padElement2 = {
         name: "rect",
@@ -3430,10 +3438,10 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       if (!shouldShowSolderMask) {
         return [padElement2];
       }
-      const maskWidth2 = width + 2 * soldermaskMargin;
-      const maskHeight2 = height + 2 * soldermaskMargin;
+      const maskWidth2 = width + m.left + m.right;
+      const maskHeight2 = height + m.top + m.bottom;
       const maskBorderRadius2 = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
-      if (soldermaskMargin < 0) {
+      if (isNegativeMargin) {
         const coveredPadElement = {
           name: "rect",
           type: "element",
@@ -3463,8 +3471,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           attributes: {
             class: "pcb-pad-exposed",
             fill: layerNameToColor(pad.layer, colorMap2),
-            x: (-maskWidth2 / 2).toString(),
-            y: (-maskHeight2 / 2).toString(),
+            x: (-width / 2 - m.left).toString(),
+            y: (-height / 2 - m.top).toString(),
             width: maskWidth2.toString(),
             height: maskHeight2.toString(),
             transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
@@ -3478,7 +3486,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         };
         return [coveredPadElement, exposedOpeningElement];
       }
-      if (soldermaskMargin === 0) {
+      if (isZeroMargin) {
         const coveredPadElement = {
           name: "rect",
           type: "element",
@@ -3510,8 +3518,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           class: "pcb-soldermask-cutout",
           fill: colorMap2.substrate,
-          x: (-maskWidth2 / 2).toString(),
-          y: (-maskHeight2 / 2).toString(),
+          x: (-width / 2 - m.left).toString(),
+          y: (-height / 2 - m.top).toString(),
           width: maskWidth2.toString(),
           height: maskHeight2.toString(),
           transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
@@ -3548,10 +3556,10 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldShowSolderMask) {
       return [padElement];
     }
-    const maskWidth = width + 2 * soldermaskMargin;
-    const maskHeight = height + 2 * soldermaskMargin;
+    const maskWidth = width + m.left + m.right;
+    const maskHeight = height + m.top + m.bottom;
     const maskBorderRadius = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
-    if (soldermaskMargin < 0) {
+    if (isNegativeMargin) {
       const coveredPadElement = {
         name: "rect",
         type: "element",
@@ -3580,8 +3588,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           class: "pcb-pad-exposed",
           fill: layerNameToColor(pad.layer, colorMap2),
-          x: (x - maskWidth / 2).toString(),
-          y: (y - maskHeight / 2).toString(),
+          x: (x - width / 2 - m.left).toString(),
+          y: (y - height / 2 - m.top).toString(),
           width: maskWidth.toString(),
           height: maskHeight.toString(),
           "data-type": "pcb_soldermask",
@@ -3594,7 +3602,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       };
       return [coveredPadElement, exposedOpeningElement];
     }
-    if (soldermaskMargin === 0) {
+    if (isZeroMargin) {
       const coveredPadElement = {
         name: "rect",
         type: "element",
@@ -3625,8 +3633,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         class: "pcb-soldermask-cutout",
         fill: colorMap2.substrate,
-        x: (x - maskWidth / 2).toString(),
-        y: (y - maskHeight / 2).toString(),
+        x: (x - width / 2 - m.left).toString(),
+        y: (y - height / 2 - m.top).toString(),
         width: maskWidth.toString(),
         height: maskHeight.toString(),
         ...maskBorderRadius > 0 ? {
@@ -6034,7 +6042,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.312",
+  version: "0.0.314",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -6057,7 +6065,7 @@ var package_default = {
     "@vitejs/plugin-react": "5.0.0",
     biome: "^0.3.3",
     "bun-match-svg": "^0.0.12",
-    "circuit-json": "^0.0.351",
+    "circuit-json": "^0.0.356",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
     react: "19.1.0",
@@ -10487,6 +10495,10 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
         { width: item.radius * 2, height: item.radius * 2 },
         0
       );
+    } else if (item.type === "schematic_path") {
+      for (const point of item.points) {
+        updateBounds(point, { width: 0.02, height: 0.02 }, 0);
+      }
     }
   }
   minX -= padding;
@@ -12683,6 +12695,44 @@ function createSvgObjectsFromSchematicArc({
   ];
 }
 
+// lib/sch/svg-object-fns/create-svg-objects-from-sch-path.ts
+import { applyToPoint as applyToPoint75 } from "transformation-matrix";
+function createSvgObjectsFromSchematicPath({
+  schPath,
+  transform,
+  colorMap: colorMap2
+}) {
+  if (!schPath.points || schPath.points.length < 2) {
+    return [];
+  }
+  const transformedPoints = schPath.points.map(
+    (p) => applyToPoint75(transform, { x: p.x, y: p.y })
+  );
+  const pathD = transformedPoints.map((p, i) => `${i === 0 ? "M" : "L"} ${p.x} ${p.y}`).join(" ");
+  const strokeColor = colorMap2.schematic.component_outline;
+  const fillColor = schPath.fill_color ?? "none";
+  const strokeWidth = Math.abs(transform.a) * 0.02;
+  return [
+    {
+      name: "path",
+      type: "element",
+      attributes: {
+        d: pathD,
+        stroke: strokeColor,
+        "stroke-width": strokeWidth.toString(),
+        fill: schPath.is_filled ? fillColor : "none",
+        "stroke-linecap": "round",
+        "stroke-linejoin": "round",
+        ...schPath.schematic_component_id && {
+          "data-schematic-component-id": schPath.schematic_component_id
+        }
+      },
+      children: [],
+      value: ""
+    }
+  ];
+}
+
 // lib/sch/convert-circuit-json-to-schematic-svg.ts
 function buildNetHoverStyles(connectivityKeys) {
   const rules = [];
@@ -12777,6 +12827,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   const schCircleSvgs = [];
   const schRectSvgs = [];
   const schArcSvgs = [];
+  const schPathSvgs = [];
   for (const elm of circuitJson) {
     if (elm.type === "schematic_debug_object") {
       schDebugObjectSvgs.push(
@@ -12883,6 +12934,14 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
           colorMap: colorMap2
         })
       );
+    } else if (elm.type === "schematic_path") {
+      schPathSvgs.push(
+        ...createSvgObjectsFromSchematicPath({
+          schPath: elm,
+          transform,
+          colorMap: colorMap2
+        })
+      );
     }
   }
   const schTraceBaseSvgs = schTraceSvgs.filter(
@@ -12899,6 +12958,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
     ...schCircleSvgs,
     ...schRectSvgs,
     ...schArcSvgs,
+    ...schPathSvgs,
     ...schComponentSvgs,
     ...schPortHoverSvgs,
     ...schNetLabel,
@@ -13760,18 +13820,18 @@ function formatNumber2(value) {
 import { distance as distance5 } from "circuit-json";
 import { stringify as stringify7 } from "svgson";
 import {
-  applyToPoint as applyToPoint77,
+  applyToPoint as applyToPoint78,
   compose as compose16,
   scale as scale9,
   translate as translate16
 } from "transformation-matrix";
 
 // lib/pcb/svg-object-fns/convert-circuit-json-to-solder-paste-mask.ts
-import { applyToPoint as applyToPoint76 } from "transformation-matrix";
+import { applyToPoint as applyToPoint77 } from "transformation-matrix";
 function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
   const { transform, layer: layerFilter } = ctx;
   if (layerFilter && solderPaste.layer !== layerFilter) return [];
-  const [x, y] = applyToPoint76(transform, [solderPaste.x, solderPaste.y]);
+  const [x, y] = applyToPoint77(transform, [solderPaste.x, solderPaste.y]);
   if (solderPaste.shape === "rect" || solderPaste.shape === "rotated_rect") {
     const width = solderPaste.width * Math.abs(transform.a);
     const height = solderPaste.height * Math.abs(transform.d);
@@ -13997,8 +14057,8 @@ function createSvgObjects4({ elm, ctx }) {
   }
 }
 function createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY) {
-  const [x1, y1] = applyToPoint77(transform, [minX, minY]);
-  const [x2, y2] = applyToPoint77(transform, [maxX, maxY]);
+  const [x1, y1] = applyToPoint78(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint78(transform, [maxX, maxY]);
   const width = Math.abs(x2 - x1);
   const height = Math.abs(y2 - y1);
   const x = Math.min(x1, x2);