easyeda 0.0.253 → 0.0.254

package/dist/index.d.ts

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

package/dist/index.js

@@ -5013,9 +5013,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 };
@@ -5141,6 +5138,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";
@@ -5281,7 +5281,8 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   shouldRecenter = true,
   cadPositionXMm,
   cadPositionYMm,
-  cadPositionZMm
+  cadPositionZMm,
+  showDesignator = false
 } = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
   const circuitElements = [];
@@ -5470,6 +5471,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   ).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)) {
@@ -5481,12 +5483,22 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
       }
     } 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)
@@ -5496,12 +5508,31 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
             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"
   );
@@ -6810,8 +6841,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) {
@@ -6895,7 +6928,8 @@ var convertBetterEasyToTsx = async ({
     shouldRecenter: true,
     cadPositionXMm: cadPlacement?.positionXMm,
     cadPositionYMm: cadPlacement?.positionYMm,
-    cadPositionZMm: cadPlacement?.positionZMm
+    cadPositionZMm: cadPlacement?.positionZMm,
+    showDesignator: true
   });
   const [cadComponent] = su(circuitJson).cad_component.list();
   if (cadComponent) {