circuit-to-svg 0.0.115 → 0.0.117

package/dist/index.js

@@ -1352,7 +1352,7 @@ var getSchScreenFontSize = (transform, textType) => {
 
 // lib/assembly/svg-object-fns/create-svg-objects-from-assembly-component.ts
 function createSvgObjectsFromAssemblyComponent(component, transform, firstPin, name) {
-  const { center, width, height, rotation = 0 } = component;
+  const { center, width, height, rotation = 0, layer = "top" } = component;
   const [x, y] = applyToPoint19(transform, [center.x, center.y]);
   const [pinX, pinY] = applyToPoint19(transform, [firstPin.x, firstPin.y]);
   const scaledWidth = width * Math.abs(transform.a);
@@ -1362,7 +1362,7 @@ function createSvgObjectsFromAssemblyComponent(component, transform, firstPin, n
     type: "element",
     value: "",
     attributes: {
-      transform: `translate(${x}, ${y}) rotate(${-rotation}) scale(1, -1)`
+      transform: `translate(${x}, ${y}) scale(1, -1)`
     },
     children: [
       createComponentPath(
@@ -1372,45 +1372,57 @@ function createSvgObjectsFromAssemblyComponent(component, transform, firstPin, n
         y,
         pinX,
         pinY,
-        rotation
+        rotation,
+        layer
       ),
       createComponentLabel(scaledWidth, scaledHeight, name ?? "", transform)
     ]
   };
 }
-function createComponentPath(scaledWidth, scaledHeight, centerX, centerY, pinX, pinY, rotation) {
+function createComponentPath(scaledWidth, scaledHeight, centerX, centerY, pinX, pinY, rotation, layer) {
   const w = scaledWidth / 2;
   const h = scaledHeight / 2;
   const cornerSize = Math.min(w, h) * 0.3;
   const isTop = pinY > centerY;
   const isLeft = pinX < centerX;
+  const strokeWidth = 0.8;
   const path = getComponentPathData(w, h, cornerSize, isTop, isLeft, rotation);
   return {
     name: "path",
     type: "element",
     attributes: {
       class: "assembly-component",
-      d: path
+      d: path,
+      "stroke-width": strokeWidth.toFixed(2),
+      transform: `rotate(${-rotation})`,
+      "stroke-dasharray": layer === "bottom" ? "2,2" : ""
     },
     value: "",
     children: []
   };
 }
 function createComponentLabel(scaledWidth, scaledHeight, name, transform) {
-  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;
+  const size = Math.min(scaledWidth, scaledHeight);
+  const minFontSize = 3;
+  const maxFontSize = 58;
+  const fontScale = 0.8;
+  const fontSize = Math.min(
+    maxFontSize,
+    Math.max(minFontSize, size * fontScale)
+  );
+  const isTall = scaledHeight > scaledWidth;
   return {
     name: "text",
     type: "element",
     attributes: {
       x: "0",
-      y: `${0 + scaledFontSize / 8}`,
+      y: "0",
       class: "assembly-component-label",
       "text-anchor": "middle",
-      "dominant-baseline": "middle",
-      "font-size": `${scaledFontSize}px`,
-      transform: "scale(1, -1)"
+      dy: ".10em",
+      style: "pointer-events: none",
+      "font-size": `${fontSize.toFixed(1)}px`,
+      transform: isTall ? "rotate(90) scale(1, -1)" : "scale(1, -1)"
     },
     children: [
       {
@@ -1466,7 +1478,7 @@ function getComponentPathData(w, h, cornerSize, isTop, isLeft, rotation) {
     ];
   }
   const rotatedCorners = corners.map(([x, y]) => rotatePoint(x, y, rotation));
-  const path = rotatedCorners.map(([x, y], index) => index === 0 ? `M${x},${y}` : `L${x},${y}`).join(" ");
+  const path = rotatedCorners.map(([x, y], i) => i === 0 ? `M${x},${y}` : `L${x},${y}`).join(" ");
   return `${path} Z`;
 }
 
@@ -1526,14 +1538,27 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
           {
             type: "text",
             value: `
-              .assembly-component { fill: #fff; stroke: #000; stroke-width: 3; }
-              .assembly-board { fill: #f2f2f2; stroke: rgb(0,0,0); stroke-opacity: 0.8; }
+              .assembly-component { 
+                fill: #fff; 
+                stroke: #000; 
+              }
+              .assembly-board { 
+                fill: #f2f2f2; 
+                stroke: rgb(0,0,0); 
+                stroke-opacity: 0.8;
+              }
               .assembly-component-label { 
                 fill: #000; 
                 font-family: Arial, serif;
                 font-weight: bold;
+                dominant-baseline: middle;
+                text-anchor: middle;
+              }
+              .assembly-boundary { 
+                fill: none; 
+                stroke: #fff;
+                stroke-width: 0.2; 
               }
-              .assembly-boundary { fill: none; stroke: #fff; stroke-width: 0.3; }
             `,
             name: "",
             attributes: {},