easyeda 0.0.264 → 0.0.266

package/dist/browser/index.js

@@ -9290,6 +9290,10 @@ var handleCutout = (solidRegion, index) => {
     }))
   });
 };
+var LEAD_SHAPE_LAYER = 100;
+var isPcbSolidRegionCutout = (shape) => {
+  return shape.fillStyle === "cutout" && shape.layermask !== LEAD_SHAPE_LAYER;
+};
 var getCadPositionZMmFromMetadata = (easyEdaJson) => {
   const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
     (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
@@ -9447,7 +9451,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
       } else if (pad.shape === "ELLIPSE") {
         soupShape = "rect";
       } else if (pad.shape === "OVAL") {
-        soupShape = "rect";
+        soupShape = "pill";
       } else if (pad.shape === "POLYGON") {
         soupShape = "polygon";
       }
@@ -9467,12 +9471,17 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
           x: mil2mm(pad.center.x),
           y: mil2mm(pad.center.y)
         },
-        ...soupShape === "rect" ? rectSize : soupShape === "polygon" && pad.points ? {
+        ...soupShape === "rect" ? rectSize : soupShape === "pill" ? {
+          ...rectSize,
+          radius: Math.min(rectSize.width, rectSize.height) / 2
+        } : soupShape === "polygon" && pad.points ? {
           points: pad.points.map((p) => ({
             x: milx10(p.x),
             y: milx10(p.y)
           }))
-        } : { radius: Math.min(mil2mm(pad.width), mil2mm(pad.height)) / 2 },
+        } : {
+          radius: Math.min(mil2mm(pad.width), mil2mm(pad.height)) / 2
+        },
         layer: "top",
         port_hints: [`pin${pinNumber}`],
         pcb_component_id: "pcb_component_1",
@@ -9491,7 +9500,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     circuitElements.push(handleVia(v, index));
   });
   easyEdaJson.packageDetail.dataStr.shape.filter(
-    (shape) => shape.type === "SOLIDREGION" && shape.fillStyle === "cutout"
+    (shape) => shape.type === "SOLIDREGION" && isPcbSolidRegionCutout(shape)
   ).forEach((sr, index) => {
     circuitElements.push(handleCutout(sr, index));
   });
@@ -9543,7 +9552,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     circuitElements.push(
       pcb_silkscreen_text.parse({
         type: "pcb_silkscreen_text",
-        pcb_silkscreen_text_id: `pcb_silkscreen_text_designator_fallback`,
+        pcb_silkscreen_text_id: "pcb_silkscreen_text_designator_fallback",
         pcb_component_id: "pcb_component_1",
         text: "{NAME}",
         anchor_position: {
@@ -10653,8 +10662,14 @@ var generateFootprintTsx = (circuitJson, options = {}) => {
         `<smtpad portHints={${JSON.stringify(mapPortHints(smtPad.port_hints, options.portHintsMap))}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" radius="${mmStr(smtPad.radius)}" shape="circle" />`
       );
     } else if (smtPad.shape === "rect") {
+      const cornerRadius = smtPad.corner_radius ?? smtPad.rect_border_radius ?? void 0;
+      const cornerRadiusAttr = cornerRadius !== void 0 ? ` cornerRadius="${mmStr(cornerRadius)}"` : "";
+      elementStrings.push(
+        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}"${cornerRadiusAttr} shape="rect" />`
+      );
+    } else if (smtPad.shape === "pill") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(mapPortHints(smtPad.port_hints, options.portHintsMap))}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}" shape="rect" />`
+        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}" radius="${mmStr(smtPad.radius)}" shape="pill" />`
       );
     } else if (smtPad.shape === "polygon") {
       const pointsStr = smtPad.points.map((p) => `{x: "${mmStr(p.x)}", y: "${mmStr(p.y)}"}`).join(", ");