easyeda 0.0.42 → 0.0.44

package/dist/{chunk-XV5WFS5P.js → chunk-NFQCYU34.js}

@@ -1285,6 +1285,183 @@ var transformPCBElements = (elms, matrix) => {
   }
   return transformedElms;
 };
+function stringHash(str) {
+  let hash = 0;
+  if (str.length == 0)
+    return hash;
+  for (var i = 0; i < str.length; i++) {
+    var char = str.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash = hash & hash;
+  }
+  return Math.abs(hash);
+}
+var nice_color_palettes = [
+  ["#69d2e7", "#a7dbd8", "#e0e4cc", "#f38630", "#fa6900"],
+  ["#fe4365", "#fc9d9a", "#f9cdad", "#c8c8a9", "#83af9b"],
+  ["#ecd078", "#d95b43", "#c02942", "#542437", "#53777a"],
+  ["#556270", "#4ecdc4", "#c7f464", "#ff6b6b", "#c44d58"],
+  ["#774f38", "#e08e79", "#f1d4af", "#ece5ce", "#c5e0dc"],
+  ["#e8ddcb", "#cdb380", "#036564", "#033649", "#031634"],
+  ["#490a3d", "#bd1550", "#e97f02", "#f8ca00", "#8a9b0f"],
+  ["#594f4f", "#547980", "#45ada8", "#9de0ad", "#e5fcc2"],
+  ["#00a0b0", "#6a4a3c", "#cc333f", "#eb6841", "#edc951"],
+  ["#e94e77", "#d68189", "#c6a49a", "#c6e5d9", "#f4ead5"],
+  ["#3fb8af", "#7fc7af", "#dad8a7", "#ff9e9d", "#ff3d7f"],
+  ["#d9ceb2", "#948c75", "#d5ded9", "#7a6a53", "#99b2b7"],
+  ["#ffffff", "#cbe86b", "#f2e9e1", "#1c140d", "#cbe86b"],
+  ["#efffcd", "#dce9be", "#555152", "#2e2633", "#99173c"],
+  ["#343838", "#005f6b", "#008c9e", "#00b4cc", "#00dffc"],
+  ["#413e4a", "#73626e", "#b38184", "#f0b49e", "#f7e4be"],
+  ["#ff4e50", "#fc913a", "#f9d423", "#ede574", "#e1f5c4"],
+  ["#99b898", "#fecea8", "#ff847c", "#e84a5f", "#2a363b"],
+  ["#655643", "#80bca3", "#f6f7bd", "#e6ac27", "#bf4d28"],
+  ["#00a8c6", "#40c0cb", "#f9f2e7", "#aee239", "#8fbe00"],
+  ["#351330", "#424254", "#64908a", "#e8caa4", "#cc2a41"],
+  ["#554236", "#f77825", "#d3ce3d", "#f1efa5", "#60b99a"],
+  ["#5d4157", "#838689", "#a8caba", "#cad7b2", "#ebe3aa"],
+  ["#8c2318", "#5e8c6a", "#88a65e", "#bfb35a", "#f2c45a"],
+  ["#fad089", "#ff9c5b", "#f5634a", "#ed303c", "#3b8183"],
+  ["#ff4242", "#f4fad2", "#d4ee5e", "#e1edb9", "#f0f2eb"],
+  ["#f8b195", "#f67280", "#c06c84", "#6c5b7b", "#355c7d"],
+  ["#d1e751", "#ffffff", "#000000", "#4dbce9", "#26ade4"],
+  ["#1b676b", "#519548", "#88c425", "#bef202", "#eafde6"],
+  ["#5e412f", "#fcebb6", "#78c0a8", "#f07818", "#f0a830"],
+  ["#bcbdac", "#cfbe27", "#f27435", "#f02475", "#3b2d38"],
+  ["#452632", "#91204d", "#e4844a", "#e8bf56", "#e2f7ce"],
+  ["#eee6ab", "#c5bc8e", "#696758", "#45484b", "#36393b"],
+  ["#f0d8a8", "#3d1c00", "#86b8b1", "#f2d694", "#fa2a00"],
+  ["#2a044a", "#0b2e59", "#0d6759", "#7ab317", "#a0c55f"],
+  ["#f04155", "#ff823a", "#f2f26f", "#fff7bd", "#95cfb7"],
+  ["#b9d7d9", "#668284", "#2a2829", "#493736", "#7b3b3b"],
+  ["#bbbb88", "#ccc68d", "#eedd99", "#eec290", "#eeaa88"],
+  ["#b3cc57", "#ecf081", "#ffbe40", "#ef746f", "#ab3e5b"],
+  ["#a3a948", "#edb92e", "#f85931", "#ce1836", "#009989"],
+  ["#300030", "#480048", "#601848", "#c04848", "#f07241"],
+  ["#67917a", "#170409", "#b8af03", "#ccbf82", "#e33258"],
+  ["#aab3ab", "#c4cbb7", "#ebefc9", "#eee0b7", "#e8caaf"],
+  ["#e8d5b7", "#0e2430", "#fc3a51", "#f5b349", "#e8d5b9"],
+  ["#ab526b", "#bca297", "#c5ceae", "#f0e2a4", "#f4ebc3"],
+  ["#607848", "#789048", "#c0d860", "#f0f0d8", "#604848"],
+  ["#b6d8c0", "#c8d9bf", "#dadabd", "#ecdbbc", "#fedcba"],
+  ["#a8e6ce", "#dcedc2", "#ffd3b5", "#ffaaa6", "#ff8c94"],
+  ["#3e4147", "#fffedf", "#dfba69", "#5a2e2e", "#2a2c31"],
+  ["#fc354c", "#29221f", "#13747d", "#0abfbc", "#fcf7c5"],
+  ["#cc0c39", "#e6781e", "#c8cf02", "#f8fcc1", "#1693a7"],
+  ["#1c2130", "#028f76", "#b3e099", "#ffeaad", "#d14334"],
+  ["#a7c5bd", "#e5ddcb", "#eb7b59", "#cf4647", "#524656"],
+  ["#dad6ca", "#1bb0ce", "#4f8699", "#6a5e72", "#563444"],
+  ["#5c323e", "#a82743", "#e15e32", "#c0d23e", "#e5f04c"],
+  ["#edebe6", "#d6e1c7", "#94c7b6", "#403b33", "#d3643b"],
+  ["#fdf1cc", "#c6d6b8", "#987f69", "#e3ad40", "#fcd036"],
+  ["#230f2b", "#f21d41", "#ebebbc", "#bce3c5", "#82b3ae"],
+  ["#b9d3b0", "#81bda4", "#b28774", "#f88f79", "#f6aa93"],
+  ["#3a111c", "#574951", "#83988e", "#bcdea5", "#e6f9bc"],
+  ["#5e3929", "#cd8c52", "#b7d1a3", "#dee8be", "#fcf7d3"],
+  ["#1c0113", "#6b0103", "#a30006", "#c21a01", "#f03c02"],
+  ["#000000", "#9f111b", "#b11623", "#292c37", "#cccccc"],
+  ["#382f32", "#ffeaf2", "#fcd9e5", "#fbc5d8", "#f1396d"],
+  ["#e3dfba", "#c8d6bf", "#93ccc6", "#6cbdb5", "#1a1f1e"],
+  ["#f6f6f6", "#e8e8e8", "#333333", "#990100", "#b90504"],
+  ["#1b325f", "#9cc4e4", "#e9f2f9", "#3a89c9", "#f26c4f"],
+  ["#a1dbb2", "#fee5ad", "#faca66", "#f7a541", "#f45d4c"],
+  ["#c1b398", "#605951", "#fbeec2", "#61a6ab", "#accec0"],
+  ["#5e9fa3", "#dcd1b4", "#fab87f", "#f87e7b", "#b05574"],
+  ["#951f2b", "#f5f4d7", "#e0dfb1", "#a5a36c", "#535233"],
+  ["#8dccad", "#988864", "#fea6a2", "#f9d6ac", "#ffe9af"],
+  ["#2d2d29", "#215a6d", "#3ca2a2", "#92c7a3", "#dfece6"],
+  ["#413d3d", "#040004", "#c8ff00", "#fa023c", "#4b000f"],
+  ["#eff3cd", "#b2d5ba", "#61ada0", "#248f8d", "#605063"],
+  ["#ffefd3", "#fffee4", "#d0ecea", "#9fd6d2", "#8b7a5e"],
+  ["#cfffdd", "#b4dec1", "#5c5863", "#a85163", "#ff1f4c"],
+  ["#9dc9ac", "#fffec7", "#f56218", "#ff9d2e", "#919167"],
+  ["#4e395d", "#827085", "#8ebe94", "#ccfc8e", "#dc5b3e"],
+  ["#a8a7a7", "#cc527a", "#e8175d", "#474747", "#363636"],
+  ["#f8edd1", "#d88a8a", "#474843", "#9d9d93", "#c5cfc6"],
+  ["#046d8b", "#309292", "#2fb8ac", "#93a42a", "#ecbe13"],
+  ["#f38a8a", "#55443d", "#a0cab5", "#cde9ca", "#f1edd0"],
+  ["#a70267", "#f10c49", "#fb6b41", "#f6d86b", "#339194"],
+  ["#ff003c", "#ff8a00", "#fabe28", "#88c100", "#00c176"],
+  ["#ffedbf", "#f7803c", "#f54828", "#2e0d23", "#f8e4c1"],
+  ["#4e4d4a", "#353432", "#94ba65", "#2790b0", "#2b4e72"],
+  ["#0ca5b0", "#4e3f30", "#fefeeb", "#f8f4e4", "#a5b3aa"],
+  ["#4d3b3b", "#de6262", "#ffb88c", "#ffd0b3", "#f5e0d3"],
+  ["#fffbb7", "#a6f6af", "#66b6ab", "#5b7c8d", "#4f2958"],
+  ["#edf6ee", "#d1c089", "#b3204d", "#412e28", "#151101"],
+  ["#9d7e79", "#ccac95", "#9a947c", "#748b83", "#5b756c"],
+  ["#fcfef5", "#e9ffe1", "#cdcfb7", "#d6e6c3", "#fafbe3"],
+  ["#9cddc8", "#bfd8ad", "#ddd9ab", "#f7af63", "#633d2e"],
+  ["#30261c", "#403831", "#36544f", "#1f5f61", "#0b8185"],
+  ["#aaff00", "#ffaa00", "#ff00aa", "#aa00ff", "#00aaff"],
+  ["#d1313d", "#e5625c", "#f9bf76", "#8eb2c5", "#615375"],
+  ["#ffe181", "#eee9e5", "#fad3b2", "#ffba7f", "#ff9c97"],
+  ["#73c8a9", "#dee1b6", "#e1b866", "#bd5532", "#373b44"],
+  ["#805841", "#dcf7f3", "#fffcdd", "#ffd8d8", "#f5a2a2"]
+];
+var getDebugLayoutObject = (lo) => {
+  let {
+    x,
+    y,
+    width,
+    height
+  } = {
+    ...lo,
+    ...lo.size,
+    ...lo.center,
+    ...lo.position
+  };
+  if (lo.x1 !== void 0 && lo.x2 !== void 0 && lo.y1 !== void 0 && lo.y2 !== void 0) {
+    x = (lo.x1 + lo.x2) / 2;
+    y = (lo.y1 + lo.y2) / 2;
+    width = Math.abs(lo.x1 - lo.x2);
+    height = Math.abs(lo.y1 - lo.y2);
+  }
+  const title = lo.text || lo.name || lo.source?.text || lo.source?.name || "?";
+  const content = lo;
+  if (x === void 0 || y === void 0)
+    return null;
+  if (width === void 0) {
+    if ("outer_diameter" in lo) {
+      width = lo.outer_diameter;
+      height = lo.outer_diameter;
+    }
+  }
+  if (width === void 0 || height === void 0) {
+    width = 0.1;
+    height = 0.1;
+  }
+  return {
+    x,
+    y,
+    width,
+    height,
+    title,
+    content,
+    bg_color: nice_color_palettes[stringHash(lo.type || title) % nice_color_palettes.length]?.[4] ?? "#f00"
+  };
+};
+var isTruthy = (value) => Boolean(value);
+var findBoundsAndCenter = (elements) => {
+  const debugObjects = elements.filter((elm) => elm.type.startsWith("pcb_")).concat(
+    elements.filter((elm) => elm.type === "pcb_trace").flatMap((elm) => elm.route)
+  ).map((elm) => getDebugLayoutObject(elm)).filter(isTruthy);
+  if (debugObjects.length === 0)
+    return { center: { x: 0, y: 0 }, width: 0, height: 0 };
+  let minX = debugObjects[0].x - debugObjects[0].width / 2;
+  let maxX = debugObjects[0].x + debugObjects[0].width / 2;
+  let minY = debugObjects[0].y - debugObjects[0].height / 2;
+  let maxY = debugObjects[0].y + debugObjects[0].height / 2;
+  for (const obj of debugObjects.slice(1)) {
+    minX = Math.min(minX, obj.x - obj.width / 2);
+    maxX = Math.max(maxX, obj.x + obj.width / 2);
+    minY = Math.min(minY, obj.y - obj.height / 2);
+    maxY = Math.max(maxY, obj.y + obj.height / 2);
+  }
+  const width = maxX - minX;
+  const height = maxY - minY;
+  const center = { x: minX + width / 2, y: minY + height / 2 };
+  return { center, width, height };
+};
 
 // lib/convert-easyeda-json-to-tscircuit-soup-json.ts
 import { compose, scale, translate } from "transformation-matrix";
@@ -1382,11 +1559,11 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
     name: "U1",
     ftype: "simple_bug",
     width: 0,
-    // TODO compute width
+    // we update this at the end
     height: 0,
-    // TODO compute height
+    // we update this at the end
     rotation: 0,
-    center: { x: centerOffset.x, y: centerOffset.y },
+    center: { x: 0, y: 0 },
     layer: "top"
   });
   soupElements.push(source_component, pcb_component2);
@@ -1475,9 +1652,14 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
     );
   }
   if (shouldRecenter) {
+    const bounds = findBoundsAndCenter(
+      // exclude the pcb_component because it's center is currently incorrect,
+      // we set it to (0,0)
+      soupElements.filter((e) => e.type !== "pcb_component")
+    );
     transformPCBElements(
       soupElements,
-      compose(translate(-centerOffset.x, centerOffset.y), scale(1, -1))
+      compose(translate(-bounds.center.x, bounds.center.y))
     );
   }
   return soupElements;
@@ -2080,43 +2262,54 @@ var EasyEdaJsonSchema = z61.object({
 
 // lib/generate-footprint-tsx.ts
 import "zod";
-import { mm as mm3 } from "@tscircuit/mm";
-var generateFootprintTsx = (easyEdaJson) => {
-  const pads = easyEdaJson.packageDetail.dataStr.shape.filter(
-    (shape) => shape.type === "PAD"
-  );
-  const centerOffset = computeCenterOffset(easyEdaJson);
-  const centerX = centerOffset.x;
-  const centerY = centerOffset.y;
-  const footprintElements = pads.map((pad) => {
-    const { center, width, height, holeRadius, number } = pad;
-    const isPlatedHole = holeRadius !== void 0 && mm3(holeRadius) > 0;
-    const normalizedX = mm3(center.x) - centerX;
-    const normalizedY = mm3(center.y) - centerY;
-    if (isPlatedHole) {
-      return `
-        <platedhole
-          pcbX="${normalizedX.toFixed(2)}mm"
-          pcbY="${normalizedY.toFixed(2)}mm"
-          hole_diameter="${mm3(holeRadius) * 2}mm"
-          outer_diameter="${mm3(width)}mm"
-          portHints={["${number}"]}
-        />`.replace(/\n/, "");
-    } else {
-      return `
-        <smtpad
-          pcbX="${normalizedX.toFixed(2)}mm"
-          pcbY="${normalizedY.toFixed(2)}mm"
-          width="${mm3(width)}mm"
-          height="${mm3(height)}mm"
-          shape="rect"
-          portHints={["${number}"]}
-        />`.replace(/\n/, "");
+import { mmStr } from "@tscircuit/mm";
+var generateFootprintTsx = (circuitJson) => {
+  const holes = su_default(circuitJson).pcb_hole.list();
+  const platedHoles = su_default(circuitJson).pcb_plated_hole.list();
+  const smtPads = su_default(circuitJson).pcb_smtpad.list();
+  const silkscreenPaths = su_default(circuitJson).pcb_silkscreen_path.list();
+  const elementStrings = [];
+  for (const hole of holes) {
+    if (hole.hole_shape === "circle") {
+      elementStrings.push(
+        `<hole pcbX="${mmStr(hole.x)}" pcbY="${mmStr(hole.y)}" diameter="${mmStr(hole.hole_diameter)}" />`
+      );
+    } else if (hole.hole_shape === "oval") {
+      console.warn("Unhandled oval hole in conversion (needs implementation)");
     }
-  });
+  }
+  for (const platedHole of platedHoles) {
+    if (platedHole.shape === "oval") {
+      elementStrings.push(
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" diameter="${mmStr(platedHole.hole_width)}" height="${mmStr(platedHole.hole_height)}" shape="oval" />`
+      );
+    } else if (platedHole.shape === "circle") {
+      elementStrings.push(
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" diameter="${mmStr(platedHole.hole_diameter)}" shape="circle" />`
+      );
+    } else if (platedHole.shape === "pill") {
+      console.warn("Unhandled pill hole in conversion (needs implementation)");
+    }
+  }
+  for (const smtPad of smtPads) {
+    if (smtPad.shape === "circle") {
+      elementStrings.push(
+        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" radius="${mmStr(smtPad.radius)}" shape="circle" />`
+      );
+    } else if (smtPad.shape === "rect") {
+      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)}" shape="rect" />`
+      );
+    }
+  }
+  for (const silkscreenPath of silkscreenPaths) {
+    elementStrings.push(
+      `<silkscreenpath route={${JSON.stringify(silkscreenPath.route)}} />`
+    );
+  }
   return `
       <footprint>
-        ${footprintElements.join("\n")}
+        ${elementStrings.join("\n")}
       </footprint>
   `.trim();
 };
@@ -2127,9 +2320,9 @@ var soupTypescriptComponentTemplate = ({
   componentName,
   schPinArrangement,
   objUrl,
-  easyEdaJson
+  circuitJson
 }) => {
-  const footprintTsx = generateFootprintTsx(easyEdaJson);
+  const footprintTsx = generateFootprintTsx(circuitJson);
   return `
 import { createUseComponent } from "@tscircuit/core"
 import type { CommonLayoutProps } from "@tscircuit/props"
@@ -2147,7 +2340,8 @@ export const ${componentName} = (props: Props) => {
       {...props}
       footprint={${footprintTsx}}
       ${objUrl ? `cadModel={{
-        objUrl: "${objUrl}"
+        objUrl: "${objUrl}",
+        rotationOffset: { x: 0, y: 0, z: 0 }
       }}` : ""}
       pinLabels={pinLabels}
       schPinSpacing={0.75}
@@ -2171,31 +2365,30 @@ function normalizeManufacturerPartNumber(partNumber) {
 }
 
 // lib/convert-to-typescript-component/index.tsx
-var convertRawEasyEdaToTs = async (rawEasy) => {
-  const easyeda = EasyEdaJsonSchema.parse(rawEasy);
-  const soup = convertEasyEdaJsonToTscircuitSoupJson(easyeda, {
-    useModelCdn: true
-  });
-  const result = await convertToTypescriptComponent({
-    easyeda,
-    soup
+var convertRawEasyToTsx = async (rawEasy) => {
+  const betterEasy = EasyEdaJsonSchema.parse(rawEasy);
+  const result = await convertBetterEasyToTsx({
+    betterEasy
   });
   return result;
 };
-var convertToTypescriptComponent = async ({
-  soup,
-  easyeda: easyEdaJson
+var convertBetterEasyToTsx = async ({
+  betterEasy
 }) => {
-  const rawPn = easyEdaJson.dataStr.head.c_para["Manufacturer Part"];
+  const circuitJson = convertEasyEdaJsonToCircuitJson(betterEasy, {
+    useModelCdn: true,
+    shouldRecenter: true
+  });
+  const rawPn = betterEasy.dataStr.head.c_para["Manufacturer Part"];
   const pn = normalizeManufacturerPartNumber(rawPn);
-  const [cad_component2] = su_default(soup).cad_component.list();
+  const [cad_component2] = su_default(circuitJson).cad_component.list();
   const pinLabels = {};
-  easyEdaJson.dataStr.shape.filter((shape) => shape.type === "PIN").forEach((pin) => {
+  betterEasy.dataStr.shape.filter((shape) => shape.type === "PIN").forEach((pin) => {
     const isPinLabelNumeric = /^\d+$/.test(pin.label);
     const label = isPinLabelNumeric ? `pin${pin.label}` : pin.label;
     pinLabels[pin.pinNumber.toString()] = label;
   });
-  const pins = easyEdaJson.dataStr.shape.filter((shape) => shape.type === "PIN");
+  const pins = betterEasy.dataStr.shape.filter((shape) => shape.type === "PIN");
   const leftPins = pins.filter((pin) => pin.rotation === 180);
   const rightPins = pins.filter((pin) => pin.rotation === 0);
   const schPinArrangement = {
@@ -2222,7 +2415,7 @@ var convertToTypescriptComponent = async ({
     pinLabels,
     schPinArrangement,
     objUrl: modelObjUrl,
-    easyEdaJson
+    circuitJson
   });
 };
 var checkModelObjUrlValidity = async (url) => {
@@ -2292,7 +2485,7 @@ var convertEasyEdaJsonToVariousFormats = async ({
         `[${jlcpcbPartNumberOrFilepath}]  Saved better EasyEDA JSON: ${outputFilename}`
       );
     } else if (outputFilename.endsWith(".tsx") || outputFilename.endsWith(".ts")) {
-      const tsComp = await convertRawEasyEdaToTs(rawEasyEdaJson);
+      const tsComp = await convertRawEasyToTsx(rawEasyEdaJson);
       await fs.writeFile(outputFilename, tsComp);
       console.log(
         `[${jlcpcbPartNumberOrFilepath}] Saved TypeScript component: ${outputFilename}`
@@ -2323,7 +2516,7 @@ export {
   PackageDetailSchema,
   EasyEdaJsonSchema,
   normalizeManufacturerPartNumber,
-  convertRawEasyEdaToTs,
+  convertRawEasyToTsx,
   convertEasyEdaJsonToVariousFormats
 };
-//# sourceMappingURL=chunk-XV5WFS5P.js.map
+//# sourceMappingURL=chunk-NFQCYU34.js.map