easyeda 0.0.258 → 0.0.260

package/dist/index.d.ts

@@ -501,11 +501,11 @@ declare const DataStrSchema: z.ZodObject<{
         y: z.ZodNumber;
         rotation: z.ZodNumber;
         fontColor: z.ZodString;
-        backgroundColor: z.ZodOptional<z.ZodString>;
+        backgroundColor: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, unknown>;
         fontSize: z.ZodString;
-        fontWeight: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        fontStyle: z.ZodDefault<z.ZodOptional<z.ZodEnum<["normal", "italic"]>>>;
-        fontDecoration: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+        fontWeight: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, unknown>;
+        fontStyle: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodEnum<["normal", "italic"]>>>, "normal" | "italic", unknown>;
+        fontDecoration: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, unknown>;
         content: z.ZodString;
         textType: z.ZodString;
         visibility: z.ZodEnum<["0", "1"]>;
@@ -541,10 +541,10 @@ declare const DataStrSchema: z.ZodObject<{
         content: string;
         textType: string;
         mirror: string;
-        backgroundColor?: string | undefined;
-        fontWeight?: string | undefined;
-        fontStyle?: "normal" | "italic" | undefined;
-        fontDecoration?: string | undefined;
+        backgroundColor?: unknown;
+        fontWeight?: unknown;
+        fontStyle?: unknown;
+        fontDecoration?: unknown;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"ARC">;
         start: z.ZodObject<{
@@ -3034,11 +3034,11 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             y: z.ZodNumber;
             rotation: z.ZodNumber;
             fontColor: z.ZodString;
-            backgroundColor: z.ZodOptional<z.ZodString>;
+            backgroundColor: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, unknown>;
             fontSize: z.ZodString;
-            fontWeight: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-            fontStyle: z.ZodDefault<z.ZodOptional<z.ZodEnum<["normal", "italic"]>>>;
-            fontDecoration: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+            fontWeight: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, unknown>;
+            fontStyle: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodEnum<["normal", "italic"]>>>, "normal" | "italic", unknown>;
+            fontDecoration: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, unknown>;
             content: z.ZodString;
             textType: z.ZodString;
             visibility: z.ZodEnum<["0", "1"]>;
@@ -3074,10 +3074,10 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
             content: string;
             textType: string;
             mirror: string;
-            backgroundColor?: string | undefined;
-            fontWeight?: string | undefined;
-            fontStyle?: "normal" | "italic" | undefined;
-            fontDecoration?: string | undefined;
+            backgroundColor?: unknown;
+            fontWeight?: unknown;
+            fontStyle?: unknown;
+            fontDecoration?: unknown;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"ARC">;
             start: z.ZodObject<{

package/dist/index.js

@@ -5368,15 +5368,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);
@@ -6363,6 +6360,12 @@ var parsePath = (str) => {
   };
 };
 var PathShapeSchema = z162.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
+var optionalEasyEdaTextField = (fieldSchema) => z162.preprocess((textField) => {
+  if (textField == null || textField === "" || textField === "undefined") {
+    return void 0;
+  }
+  return textField;
+}, fieldSchema);
 var TextShapeOutputSchema = z162.object({
   type: z162.literal("TEXT"),
   alignment: z162.enum(["L", "C", "R"]),
@@ -6370,11 +6373,13 @@ var TextShapeOutputSchema = z162.object({
   y: z162.number(),
   rotation: z162.number(),
   fontColor: z162.string(),
-  backgroundColor: z162.string().optional(),
+  backgroundColor: optionalEasyEdaTextField(z162.string().optional()),
   fontSize: z162.string(),
-  fontWeight: z162.string().optional().default("normal"),
-  fontStyle: z162.enum(["normal", "italic"]).optional().default("normal"),
-  fontDecoration: z162.string().optional().default(""),
+  fontWeight: optionalEasyEdaTextField(z162.string().optional().default("normal")),
+  fontStyle: optionalEasyEdaTextField(
+    z162.enum(["normal", "italic"]).optional().default("normal")
+  ),
+  fontDecoration: optionalEasyEdaTextField(z162.string().optional().default("")),
   content: z162.string(),
   textType: z162.string(),
   visibility: z162.enum(["0", "1"]),
@@ -6407,11 +6412,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,
@@ -6815,7 +6820,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" />`
       );