easyeda 0.0.258 → 0.0.260

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.257",
+  version: "0.0.258",
   files: [
     "dist"
   ],
@@ -6416,15 +6416,12 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         const innerWidth = largestOuterDimensionName === "width" ? largestInnerDimension : smallestInnerDimension;
         const innerHeight = largestOuterDimensionName === "height" ? largestInnerDimension : smallestInnerDimension;
         additionalPlatedHoleProps = {
-          shape: "pill_hole_with_rect_pad",
-          hole_shape: "pill",
-          pad_shape: "rect",
+          shape: "pill",
           hole_width: innerWidth,
           hole_height: innerHeight,
-          rect_pad_width: mil2mm(pad.width),
-          rect_pad_height: mil2mm(pad.height),
-          hole_offset_x: 0,
-          hole_offset_y: 0
+          outer_width: mil2mm(pad.width),
+          outer_height: mil2mm(pad.height),
+          ccw_rotation: pad.rotation || 0
         };
       } else if (pad.shape === "RECT") {
         const padWidth = mil2mm(pad.width);
@@ -7266,6 +7263,12 @@ var parsePath = (str) => {
   };
 };
 var PathShapeSchema = import_zod162.z.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
+var optionalEasyEdaTextField = (fieldSchema) => import_zod162.z.preprocess((textField) => {
+  if (textField == null || textField === "" || textField === "undefined") {
+    return void 0;
+  }
+  return textField;
+}, fieldSchema);
 var TextShapeOutputSchema = import_zod162.z.object({
   type: import_zod162.z.literal("TEXT"),
   alignment: import_zod162.z.enum(["L", "C", "R"]),
@@ -7273,11 +7276,13 @@ var TextShapeOutputSchema = import_zod162.z.object({
   y: import_zod162.z.number(),
   rotation: import_zod162.z.number(),
   fontColor: import_zod162.z.string(),
-  backgroundColor: import_zod162.z.string().optional(),
+  backgroundColor: optionalEasyEdaTextField(import_zod162.z.string().optional()),
   fontSize: import_zod162.z.string(),
-  fontWeight: import_zod162.z.string().optional().default("normal"),
-  fontStyle: import_zod162.z.enum(["normal", "italic"]).optional().default("normal"),
-  fontDecoration: import_zod162.z.string().optional().default(""),
+  fontWeight: optionalEasyEdaTextField(import_zod162.z.string().optional().default("normal")),
+  fontStyle: optionalEasyEdaTextField(
+    import_zod162.z.enum(["normal", "italic"]).optional().default("normal")
+  ),
+  fontDecoration: optionalEasyEdaTextField(import_zod162.z.string().optional().default("")),
   content: import_zod162.z.string(),
   textType: import_zod162.z.string(),
   visibility: import_zod162.z.enum(["0", "1"]),
@@ -7310,11 +7315,11 @@ var parseText = (str) => {
     y: Number(y),
     rotation: Number(rotation2),
     fontColor,
-    backgroundColor: backgroundColor || void 0,
+    backgroundColor,
     fontSize,
-    fontWeight: fontWeight || "normal",
-    fontStyle: fontStyle || "normal",
-    fontDecoration: fontDecoration || "",
+    fontWeight,
+    fontStyle,
+    fontDecoration,
     content,
     textType,
     visibility,
@@ -7718,7 +7723,13 @@ var generateFootprintTsx = (circuitJson) => {
     }
   }
   for (const platedHole of platedHoles) {
-    if (platedHole.shape === "pill_hole_with_rect_pad") {
+    if (platedHole.shape === "pill" || platedHole.shape === "oval") {
+      const cccwRotationDegree = platedHole.ccw_rotation || 0;
+      const rotation2 = cccwRotationDegree ? ` pcbRotation="${cccwRotationDegree}deg"` : "";
+      elementStrings.push(
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" holeWidth="${mmStr(platedHole.hole_width)}" holeHeight="${mmStr(platedHole.hole_height)}" outerWidth="${mmStr(platedHole.outer_width)}" outerHeight="${mmStr(platedHole.outer_height)}"${rotation2} shape="${platedHole.shape}" />`
+      );
+    } else if (platedHole.shape === "pill_hole_with_rect_pad") {
       elementStrings.push(
         `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" holeWidth="${mmStr(platedHole.hole_width)}" holeHeight="${mmStr(platedHole.hole_height)}" outerWidth="${mmStr(platedHole.rect_pad_width)}" outerHeight="${mmStr(platedHole.rect_pad_height)}" shape="pill" />`
       );