easyeda 0.0.265 → 0.0.267

package/dist/main.cjs

@@ -997,7 +997,7 @@ var import_promises = __toESM(require("fs/promises"), 1);
 var package_default = {
   name: "easyeda",
   type: "module",
-  version: "0.0.264",
+  version: "0.0.266",
   files: [
     "dist"
   ],
@@ -6435,13 +6435,14 @@ var handleHoleCutout = (hole, index) => {
   });
 };
 var handleVia = (via, index) => {
+  const holeDiameter = via.holeRadius * 2;
   return pcb_via.parse({
     type: "pcb_via",
     pcb_via_id: `pcb_via_${index + 1}`,
     x: milx10(via.center.x),
     y: milx10(via.center.y),
     outer_diameter: milx10(via.outerDiameter),
-    hole_diameter: milx10(via.holeDiameter),
+    hole_diameter: milx10(holeDiameter),
     layers: ["top", "bottom"]
   });
 };
@@ -6456,6 +6457,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
@@ -6662,7 +6667,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));
   });
@@ -6714,7 +6719,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: {
@@ -6999,7 +7004,7 @@ var ViaSchema = BaseShapeSchema.extend({
   type: import_zod161.z.literal("VIA"),
   center: PointSchema,
   outerDiameter: import_zod161.z.number(),
-  holeDiameter: import_zod161.z.number()
+  holeRadius: import_zod161.z.number()
 });
 var RectSchema = BaseShapeSchema.extend({
   type: import_zod161.z.literal("RECT"),
@@ -7149,13 +7154,13 @@ var ShapeItemSchema = import_zod161.z.object({
       });
     }
     case "VIA": {
-      const [x, y, outerDiameter, , holeDiameter, id] = shape.data.split("~");
+      const [x, y, outerDiameter, , holeRadius, id] = shape.data.split("~");
       const center = [Number(x), Number(y)];
       return ViaSchema.parse({
         type: "VIA",
         center,
         outerDiameter: Number(outerDiameter),
-        holeDiameter: Number(holeDiameter),
+        holeRadius: Number(holeRadius),
         id
       });
     }