easyeda 0.0.252 → 0.0.254

package/dist/browser/index.js

@@ -8896,9 +8896,6 @@ var mmStr = (n) => {
   return `${mm(n)}mm`;
 };
 
-// lib/constants.ts
-var DEFAULT_PCB_THICKNESS_MM = 1.6;
-
 // lib/math/arc-utils.ts
 function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
@@ -9024,6 +9021,9 @@ var normalizeSymbolName = (name) => {
   return trimmedName;
 };
 
+// lib/constants.ts
+var DEFAULT_PCB_THICKNESS_MM = 1.6;
+
 // lib/convert-easyeda-json-to-tscircuit-soup-json.ts
 var EASYEDA_STEP_MODEL_URL = "https://modules.easyeda.com/qAxj6KHrDKw4blvCG8QJPs7Y";
 var EASYEDA_OBJ_MODEL_URL = "https://modules.easyeda.com/3dmodel";
@@ -9159,7 +9159,14 @@ var getCadPositionZMmFromMetadata = (easyEdaJson) => {
   const minZ = Math.abs(bounds.min.z) < 1e-6 ? 0 : bounds.min.z;
   return minZ - mil10ToMm(svgNodeZ);
 };
-var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecenter = true, cadPositionZMm } = {}) => {
+var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
+  useModelCdn,
+  shouldRecenter = true,
+  cadPositionXMm,
+  cadPositionYMm,
+  cadPositionZMm,
+  showDesignator = false
+} = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
   const circuitElements = [];
   const source_component = any_source_component.parse({
@@ -9347,6 +9354,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
   ).forEach((sr, index) => {
     circuitElements.push(handleCutout(sr, index));
   });
+  let hasFoundDesignator = false;
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
       if (!isCourtyardLayer(shape.layer)) {
@@ -9358,12 +9366,22 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
       }
     } else if (shape.type === "TEXT") {
       if (isCourtyardLayer(shape.layer)) return;
+      let text = shape.text;
+      const designatorPrefix = easyEdaJson.dataStr.head.c_para.pre || "U";
+      const normalizedPrefix = designatorPrefix.replace(/\?/g, "");
+      const trimmedText = text.trim();
+      const isDesignator = trimmedText === designatorPrefix || trimmedText === `${normalizedPrefix}?` || trimmedText === normalizedPrefix;
+      if (isDesignator) {
+        if (!showDesignator) return;
+        text = "{NAME}";
+        hasFoundDesignator = true;
+      }
       circuitElements.push(
         pcb_silkscreen_text.parse({
           type: "pcb_silkscreen_text",
           pcb_silkscreen_text_id: `pcb_silkscreen_text_${index + 1}`,
           pcb_component_id: "pcb_component_1",
-          text: normalizeSymbolName(shape.text),
+          text,
           anchor_position: {
             x: mil2mm(shape.x),
             y: mil2mm(shape.y)
@@ -9373,12 +9391,31 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
             C: "center",
             R: "bottom_right"
           }[shape.textAnchor ?? "L"],
-          font_size: shape.size_mm ? shape.size_mm : void 0,
+          font_size: shape.size_mm || 1,
           layer: "top"
         })
       );
     }
   });
+  if (!hasFoundDesignator && showDesignator) {
+    const bbox = easyEdaJson.packageDetail.dataStr.BBox;
+    circuitElements.push(
+      pcb_silkscreen_text.parse({
+        type: "pcb_silkscreen_text",
+        pcb_silkscreen_text_id: `pcb_silkscreen_text_designator_fallback`,
+        pcb_component_id: "pcb_component_1",
+        text: "{NAME}",
+        anchor_position: {
+          x: milx10(bbox.x + bbox.width / 2),
+          y: milx10(bbox.y) - 1
+          // 1mm above top edge
+        },
+        anchor_alignment: "center",
+        font_size: 1,
+        layer: "top"
+      })
+    );
+  }
   const pcbElements = circuitElements.filter(
     (e) => e.type === "pcb_smtpad" || e.type === "pcb_plated_hole" || e.type === "pcb_hole" || e.type === "pcb_via" || e.type === "pcb_courtyard_outline" || e.type === "pcb_silkscreen_path" || e.type === "pcb_silkscreen_text"
   );
@@ -9404,8 +9441,8 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
         anchor_alignment: "center_of_component_on_board_surface",
         model_origin_alignment: "center_of_component_on_board_surface",
         model_origin_position: {
-          x: 0,
-          y: 0,
+          x: cadPositionXMm ?? 0,
+          y: cadPositionYMm ?? 0,
           z: resolvedCadPositionZMm ?? position2.z
         },
         position: { x: 0, y: 0, z: 0 },
@@ -10293,6 +10330,92 @@ 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);
+  const bounds = easyEdaJson._objMetadata?.bounds;
+  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-model-cdn-url.ts
 var getModelObjCdnUrl = ({
   easyedaModelUuid,
@@ -10342,28 +10465,16 @@ var parseObjBounds = (objText) => {
     max: { x: maxX, y: maxY, z: maxZ }
   };
 };
-var getSvgNodeZOffsetMm = (easyEdaJson) => {
-  const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
-    (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
-  );
-  if (!svgNode || svgNode.type !== "SVGNODE") return null;
-  const svgNodeZ = Number(svgNode.svgData.attrs?.z ?? 0);
-  if (!Number.isFinite(svgNodeZ)) return null;
-  return mil10ToMm(svgNodeZ);
-};
 var getPositionZMmFromBounds = (bounds, svgNodeZOffsetMm) => {
   const minZ = Math.abs(bounds.min.z) < 1e-6 ? 0 : bounds.min.z;
   return minZ - svgNodeZOffsetMm;
 };
 var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalThis.fetch } = {}) => {
-  const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
-    (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
-  );
-  if (!svgNode || svgNode.type !== "SVGNODE") return null;
-  const modelUuid = svgNode.svgData.attrs?.uuid;
+  const modelUuid = getCadSvgNodeModelUuid(easyEdaJson);
   const partNumber = easyEdaJson.lcsc.number;
-  const svgNodeZOffsetMm = getSvgNodeZOffsetMm(easyEdaJson);
-  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !fetch2) {
+  const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
+  const svgNodeZOffsetMm = getCadSvgNodeZOffsetMm(easyEdaJson);
+  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !derivedOffsetMm || !fetch2) {
     return null;
   }
   const modelObjUrl = getModelObjCdnUrl({
@@ -10378,6 +10489,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalTh
   if (metadataBounds) {
     return {
       modelObjUrl,
+      positionXMm: derivedOffsetMm.x,
+      positionYMm: derivedOffsetMm.y,
       modelStepUrl,
       bounds: metadataBounds,
       positionZMm: getPositionZMmFromBounds(metadataBounds, svgNodeZOffsetMm)
@@ -10395,6 +10508,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalTh
       if (!bounds) return null;
       return {
         modelObjUrl,
+        positionXMm: derivedOffsetMm.x,
+        positionYMm: derivedOffsetMm.y,
         modelStepUrl,
         bounds,
         // Align the EasyEDA SVG-node Z against the model's minimum Z.
@@ -10474,8 +10589,10 @@ var generateFootprintTsx = (circuitJson) => {
     );
   }
   for (const silkscreenText of silkscreenTexts) {
+    const isRefDes = silkscreenText.text === "{NAME}";
+    const textValue = isRefDes ? "{props.name}" : JSON.stringify(silkscreenText.text);
     elementStrings.push(
-      `<silkscreentext text="${silkscreenText.text}" pcbX="${mmStr(silkscreenText.anchor_position.x)}" pcbY="${mmStr(silkscreenText.anchor_position.y)}" anchorAlignment="${silkscreenText.anchor_alignment}" ${silkscreenText.font_size ? `fontSize="${mmStr(silkscreenText.font_size)}"` : ""} />`
+      `<silkscreentext text=${textValue} pcbX="${mmStr(silkscreenText.anchor_position.x)}" pcbY="${mmStr(silkscreenText.anchor_position.y)}" anchorAlignment="${silkscreenText.anchor_alignment}" ${silkscreenText.font_size ? `fontSize="${mmStr(silkscreenText.font_size)}"` : ""} />`
     );
   }
   for (const courtyardOutline of courtyardOutlines) {
@@ -10557,7 +10674,10 @@ var convertBetterEasyToTsx = async ({
   const circuitJson = convertEasyEdaJsonToCircuitJson(betterEasy, {
     useModelCdn: true,
     shouldRecenter: true,
-    cadPositionZMm: cadPlacement?.positionZMm
+    cadPositionXMm: cadPlacement?.positionXMm,
+    cadPositionYMm: cadPlacement?.positionYMm,
+    cadPositionZMm: cadPlacement?.positionZMm,
+    showDesignator: true
   });
   const [cadComponent] = su(circuitJson).cad_component.list();
   if (cadComponent) {