easyeda 0.0.263 → 0.0.265

package/dist/index.d.ts

@@ -4867,9 +4867,21 @@ interface Options {
     cadPositionXMm?: number;
     cadPositionYMm?: number;
     cadPositionZMm?: number;
+    cadModelBounds?: {
+        min: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        max: {
+            x: number;
+            y: number;
+            z: number;
+        };
+    };
     showDesignator?: boolean;
 }
-declare const convertEasyEdaJsonToCircuitJson: (easyEdaJson: BetterEasyEdaJson, { useModelCdn, shouldRecenter, cadPositionXMm, cadPositionYMm, cadPositionZMm, showDesignator, }?: Options) => AnyCircuitElement[];
+declare const convertEasyEdaJsonToCircuitJson: (easyEdaJson: BetterEasyEdaJson, { useModelCdn, shouldRecenter, cadPositionXMm, cadPositionYMm, cadPositionZMm, cadModelBounds, showDesignator, }?: Options) => AnyCircuitElement[];
 
 declare function fetchEasyEDAComponent(jlcpcbPartNumber: string, { fetch, includeModelMetadata, }?: {
     fetch?: typeof globalThis.fetch;

package/dist/index.js

@@ -5033,11 +5033,11 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
   const midY = (startY + endY) / 2;
   const dx = endX - startX;
   const dy = endY - startY;
-  const distance2 = Math.sqrt(dx * dx + dy * dy);
-  if (distance2 === 0 || radius < distance2 / 2) {
+  const distance3 = Math.sqrt(dx * dx + dy * dy);
+  if (distance3 === 0 || radius < distance3 / 2) {
     return [start, end];
   }
-  const h = Math.sqrt(radius * radius - distance2 * distance2 / 4);
+  const h = Math.sqrt(radius * radius - distance3 * distance3 / 4);
   const angle = Math.atan2(dy, dx);
   const centerX = midX + h * Math.sin(angle) * (sweepFlag ? -1 : 1);
   const centerY = midY - h * Math.cos(angle) * (sweepFlag ? -1 : 1);
@@ -5073,6 +5073,142 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
 // lib/utils/easyeda-unit-to-mm.ts
 var mil10ToMm = (value) => value * 10 * 0.0254;
 
+// node_modules/@tscircuit/math-utils/dist/chunk-3WCUPG5S.js
+var getBoundsCenter = (bounds) => ({
+  x: (bounds.minX + bounds.maxX) / 2,
+  y: (bounds.minY + bounds.maxY) / 2
+});
+
+// node_modules/@tscircuit/math-utils/dist/chunk-5N7UJNVK.js
+var getBoundsFromPoints = (points) => {
+  if (points.length === 0) {
+    return null;
+  }
+  let minX = points[0].x;
+  let minY = points[0].y;
+  let maxX = points[0].x;
+  let maxY = points[0].y;
+  for (let i = 1; i < points.length; i++) {
+    const point2 = points[i];
+    if (point2.x < minX) minX = point2.x;
+    if (point2.y < minY) minY = point2.y;
+    if (point2.x > maxX) maxX = point2.x;
+    if (point2.y > maxY) maxY = point2.y;
+  }
+  return { minX, minY, maxX, maxY };
+};
+
+// lib/websafe/get-easyeda-cad-placement-helpers.ts
+var getCadSvgNode = (easyEdaJson) => {
+  const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
+    (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
+  );
+  return svgNode?.type === "SVGNODE" ? svgNode : null;
+};
+var isSvgChildNodeWithAttrs = (childNode) => typeof childNode === "object" && childNode !== null;
+var getXyBoundsFromModelBounds = (bounds) => ({
+  minX: bounds.min.x,
+  minY: bounds.min.y,
+  maxX: bounds.max.x,
+  maxY: bounds.max.y
+});
+var rotateScenePoint = (point2, rotationDeg) => {
+  switch (rotationDeg) {
+    case 0:
+      return point2;
+    case 90:
+      return { x: point2.y, y: -point2.x };
+    case 180:
+      return { x: -point2.x, y: -point2.y };
+    case 270:
+      return { x: -point2.y, y: point2.x };
+  }
+};
+var getEasyEdaModelOriginOnBoardMm = ({
+  svgNode,
+  footprintCenterMm
+}) => {
+  const points = [];
+  for (const childNode of svgNode.svgData.childNodes ?? []) {
+    if (!isSvgChildNodeWithAttrs(childNode)) continue;
+    const rawPoints = childNode.attrs?.points;
+    if (!rawPoints) continue;
+    const values = String(rawPoints).trim().split(/\s+/).map(Number);
+    for (let i = 0; i + 1 < values.length; i += 2) {
+      const x = values[i];
+      const y = values[i + 1];
+      if (Number.isFinite(x) && Number.isFinite(y)) {
+        points.push({ x: mil10ToMm(x), y: mil10ToMm(y) });
+      }
+    }
+  }
+  let modelOriginMm = null;
+  if (points.length > 0) {
+    const bounds = getBoundsFromPoints(points);
+    modelOriginMm = bounds ? getBoundsCenter(bounds) : null;
+  } else {
+    const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
+    if (Number.isFinite(originX) && Number.isFinite(originY)) {
+      modelOriginMm = { x: mil10ToMm(originX), y: mil10ToMm(originY) };
+    }
+  }
+  if (!modelOriginMm) return null;
+  return {
+    x: modelOriginMm.x - footprintCenterMm.x,
+    y: footprintCenterMm.y - modelOriginMm.y
+  };
+};
+var snapZero = (value) => Math.abs(value) < 1e-6 ? 0 : value;
+var normalizePoint = (point2) => ({
+  x: snapZero(point2.x),
+  y: snapZero(point2.y)
+});
+var getCadModelOffsetMm = (easyEdaJson) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
+  return getCadModelOffsetMmFromBounds(
+    easyEdaJson,
+    easyEdaJson._objMetadata?.bounds
+  );
+};
+var getCadModelOffsetMmFromBounds = (easyEdaJson, bounds, {
+  footprintBoundsCenterMm
+} = {}) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
+  if (!svgNode || !bounds) return null;
+  const [, , rotationZRaw] = String(
+    svgNode.svgData.attrs?.c_rotation ?? "0,0,0"
+  ).split(",").map((value) => Number(value.trim()));
+  const rotationDeg = (rotationZRaw % 360 + 360) % 360;
+  if (![0, 90, 180, 270].includes(rotationDeg)) return null;
+  const modelCenter = getBoundsCenter(getXyBoundsFromModelBounds(bounds));
+  const footprintCenter = easyEdaJson.packageDetail.dataStr.head;
+  const footprintCenterMm = footprintBoundsCenterMm ?? {
+    x: mil10ToMm(footprintCenter.x),
+    y: mil10ToMm(footprintCenter.y)
+  };
+  const targetOriginOnBoardMm = getEasyEdaModelOriginOnBoardMm({
+    svgNode,
+    footprintCenterMm
+  });
+  if (!targetOriginOnBoardMm) return null;
+  const targetOriginInModelFrame = rotateScenePoint(
+    targetOriginOnBoardMm,
+    rotationDeg
+  );
+  return normalizePoint({
+    x: modelCenter.x - targetOriginInModelFrame.x,
+    y: modelCenter.y - targetOriginInModelFrame.y
+  });
+};
+var getCadSvgNodeZOffsetMm = (easyEdaJson) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
+  if (!svgNode) return null;
+  const svgNodeZ = Number(svgNode.svgData.attrs?.z ?? 0);
+  if (!Number.isFinite(svgNodeZ)) return null;
+  return mil10ToMm(svgNodeZ);
+};
+var getCadSvgNodeModelUuid = (easyEdaJson) => getCadSvgNode(easyEdaJson)?.svgData.attrs?.uuid ?? null;
+
 // lib/utils/normalize-pin-labels.ts
 var normalizePinLabels = (inputPinLabels) => {
   const uniqueInputPinLabels = inputPinLabels.map((labels) => [
@@ -5289,6 +5425,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   cadPositionXMm,
   cadPositionYMm,
   cadPositionZMm,
+  cadModelBounds,
   showDesignator = false
 } = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
@@ -5427,7 +5564,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";
       }
@@ -5447,12 +5584,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",
@@ -5641,6 +5783,14 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         if (!cad.model_origin_position) {
           cad.model_origin_position = { x: 0, y: 0, z: 0 };
         }
+        const resolvedCadModelBounds = cadModelBounds ?? easyEdaJson._objMetadata?.bounds;
+        const recenteredCadOffset = resolvedCadModelBounds && getCadModelOffsetMmFromBounds(easyEdaJson, resolvedCadModelBounds, {
+          footprintBoundsCenterMm: bounds.center
+        });
+        if (recenteredCadOffset) {
+          cad.model_origin_position.x = recenteredCadOffset.x;
+          cad.model_origin_position.y = recenteredCadOffset.y;
+        }
         const side = pcb_component2.layer ?? "top";
         const t = DEFAULT_PCB_THICKNESS_MM / 2;
         const attrs = svgNode?.svgData?.attrs ?? {};
@@ -6610,98 +6760,6 @@ function normalizeManufacturerPartNumber(partNumber) {
   return normalized;
 }
 
-// lib/websafe/get-easyeda-cad-placement-helpers.ts
-var milToMm = (mil) => mil * 0.0254;
-var getBoundsCenter = (bounds) => ({
-  x: (bounds.min.x + bounds.max.x) / 2,
-  y: (bounds.min.y + bounds.max.y) / 2
-});
-var getCadSvgNode = (easyEdaJson) => {
-  const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
-    (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
-  );
-  return svgNode?.type === "SVGNODE" ? svgNode : null;
-};
-var parseMil10Value = (value) => Number(String(value).replace("mil", "")) / 10;
-var isZeroishModelCenter = (value) => Math.abs(value) < 1e-6;
-var isZeroishFootprintDelta = (value) => Math.abs(value) < 1e-3;
-var getPadCenter = (easyEdaJson) => {
-  const pads = easyEdaJson.packageDetail.dataStr.shape.filter(
-    (shape) => shape.type === "PAD"
-  );
-  if (pads.length === 0) return null;
-  const xs = pads.map((pad) => parseMil10Value(pad.center.x));
-  const ys = pads.map((pad) => parseMil10Value(pad.center.y));
-  return {
-    x: (Math.min(...xs) + Math.max(...xs)) / 2,
-    y: (Math.min(...ys) + Math.max(...ys)) / 2
-  };
-};
-var getRotatedOffsetMm = ({
-  bounds,
-  rawOffsetMil,
-  rotationDeg
-}) => {
-  const center = getBoundsCenter(bounds);
-  const offsetX = milToMm(rawOffsetMil.x);
-  const offsetY = milToMm(rawOffsetMil.y);
-  switch (rotationDeg) {
-    case 0:
-      return { x: center.x + offsetX, y: center.y + offsetY };
-    case 90:
-      return { x: center.x + offsetY, y: center.y + offsetX };
-    case 180:
-      return { x: center.x - offsetX, y: center.y - offsetY };
-    case 270:
-      return { x: center.x - offsetY, y: center.y - offsetX };
-  }
-};
-var getCadModelOffsetMm = (easyEdaJson) => {
-  const svgNode = getCadSvgNode(easyEdaJson);
-  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;
-  const [, , rotationZRaw] = String(
-    svgNode.svgData.attrs?.c_rotation ?? "0,0,0"
-  ).split(",").map((value) => Number(value.trim()));
-  const rotationDeg = (rotationZRaw % 360 + 360) % 360;
-  if (![0, 90, 180, 270].includes(rotationDeg)) return null;
-  const modelCenter = getBoundsCenter(bounds);
-  const footprintCenter = easyEdaJson.packageDetail.dataStr.head;
-  const padCenter = getPadCenter(easyEdaJson);
-  const padCenterDelta = padCenter ? {
-    x: padCenter.x - footprintCenter.x,
-    y: padCenter.y - footprintCenter.y
-  } : null;
-  const rawOffsetMil = {
-    x: (originX - footprintCenter.x) * 10,
-    y: (originY - footprintCenter.y) * 10
-  };
-  if (padCenter && padCenterDelta && isZeroishModelCenter(modelCenter.x) && isZeroishModelCenter(modelCenter.y) && isZeroishFootprintDelta(padCenterDelta.x) && isZeroishFootprintDelta(padCenterDelta.y)) {
-    return { x: 0, y: 0 };
-  }
-  return getRotatedOffsetMm({
-    bounds,
-    rawOffsetMil,
-    rotationDeg
-  });
-};
-var getCadSvgNodeZOffsetMm = (easyEdaJson) => {
-  const svgNode = getCadSvgNode(easyEdaJson);
-  if (!svgNode) return null;
-  const svgNodeZ = Number(svgNode.svgData.attrs?.z ?? 0);
-  if (!Number.isFinite(svgNodeZ)) return null;
-  return mil10ToMm(svgNodeZ);
-};
-var getCadSvgNodeModelUuid = (easyEdaJson) => getCadSvgNode(easyEdaJson)?.svgData.attrs?.uuid ?? null;
-
 // lib/websafe/get-easyeda-cad-model-placement.ts
 var placementCache = /* @__PURE__ */ new Map();
 var parseObjBounds2 = (objText) => {
@@ -6852,8 +6910,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(", ");
@@ -7089,6 +7153,7 @@ var convertBetterEasyToTsx = async ({
     cadPositionXMm: cadPlacement?.positionXMm,
     cadPositionYMm: cadPlacement?.positionYMm,
     cadPositionZMm: cadPlacement?.positionZMm,
+    cadModelBounds: cadPlacement?.bounds,
     showDesignator: true
   });
   const [cadComponent] = su(circuitJson).cad_component.list();