easyeda 0.0.257 → 0.0.259

package/dist/browser/index.js

@@ -9251,15 +9251,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);
@@ -10385,7 +10382,13 @@ var getRotatedOffsetMm = ({
 };
 var getCadModelOffsetMm = (easyEdaJson) => {
   const svgNode = getCadSvgNode(easyEdaJson);
-  const bounds = easyEdaJson._objMetadata?.bounds;
+  return getCadModelOffsetMmFromBounds(
+    easyEdaJson,
+    easyEdaJson._objMetadata?.bounds
+  );
+};
+var getCadModelOffsetMmFromBounds = (easyEdaJson, bounds) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
   if (!svgNode || !bounds) return null;
   const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
   if (!Number.isFinite(originX) || !Number.isFinite(originY)) return null;
@@ -10479,9 +10482,8 @@ var getPositionZMmFromBounds = (bounds, svgNodeZOffsetMm) => {
 var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalThis.fetch } = {}) => {
   const modelUuid = getCadSvgNodeModelUuid(easyEdaJson);
   const partNumber = easyEdaJson.lcsc.number;
-  const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
   const svgNodeZOffsetMm = getCadSvgNodeZOffsetMm(easyEdaJson);
-  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !derivedOffsetMm || !fetch2) {
+  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !fetch2) {
     return null;
   }
   const modelObjUrl = getModelObjCdnUrl({
@@ -10494,6 +10496,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalTh
   });
   const metadataBounds = easyEdaJson._objMetadata?.bounds;
   if (metadataBounds) {
+    const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
+    if (!derivedOffsetMm) return null;
     return {
       modelObjUrl,
       positionXMm: derivedOffsetMm.x,
@@ -10513,6 +10517,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalTh
       const objText = await response.text();
       const bounds = parseObjBounds(objText);
       if (!bounds) return null;
+      const derivedOffsetMm = getCadModelOffsetMmFromBounds(easyEdaJson, bounds);
+      if (!derivedOffsetMm) return null;
       return {
         modelObjUrl,
         positionXMm: derivedOffsetMm.x,
@@ -10554,7 +10560,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" />`
       );