easyeda 0.0.250 → 0.0.251

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { z } from 'zod';
 import { AnyCircuitElement } from 'circuit-json';
+import { z } from 'zod';
 
 declare const maybeNumber: z.ZodPipeline<z.ZodEffects<z.ZodAny, any, any>, z.ZodOptional<z.ZodNullable<z.ZodNumber>>>;
 declare const SzlcscSchema: z.ZodObject<{
@@ -4870,7 +4870,10 @@ declare function fetchEasyEDAComponent(jlcpcbPartNumber: string, { fetch, includ
     includeModelMetadata?: boolean;
 }): Promise<RawEasyEdaJson>;
 
-declare const convertRawEasyToTsx: (rawEasy: any) => Promise<string>;
+declare const convertRawEasyToTsx: ({ rawEasy, format, }: {
+    rawEasy: any;
+    format?: "obj" | "step";
+}) => Promise<string>;
 
 declare function normalizeManufacturerPartNumber(partNumber: string): string;
 

package/dist/index.js

@@ -3643,51 +3643,6 @@ var any_soup_element = any_circuit_element;
 expectTypesMatch(true);
 expectStringUnionsMatch(true);
 
-// lib/math/arc-utils.ts
-function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
-  const start = { x: startX, y: startY };
-  const end = { x: endX, y: endY };
-  const midX = (startX + endX) / 2;
-  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) {
-    return [start, end];
-  }
-  const h = Math.sqrt(radius * radius - distance2 * distance2 / 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);
-  const startAngle = Math.atan2(startY - centerY, startX - centerX);
-  let endAngle = Math.atan2(endY - centerY, endX - centerX);
-  if (sweepFlag && endAngle > startAngle) {
-    endAngle -= 2 * Math.PI;
-  } else if (!sweepFlag && endAngle < startAngle) {
-    endAngle += 2 * Math.PI;
-  }
-  if (!largeArcFlag && Math.abs(endAngle - startAngle) > Math.PI || largeArcFlag && Math.abs(endAngle - startAngle) < Math.PI) {
-    if (endAngle > startAngle) {
-      endAngle -= 2 * Math.PI;
-    } else {
-      endAngle += 2 * Math.PI;
-    }
-  }
-  const numPoints = Math.max(
-    2,
-    Math.ceil(Math.abs(endAngle - startAngle) * radius)
-  );
-  const path2 = [];
-  for (let i = 0; i <= numPoints; i++) {
-    const t = i / numPoints;
-    const angle2 = startAngle + t * (endAngle - startAngle);
-    const x = centerX + radius * Math.cos(angle2);
-    const y = centerY + radius * Math.sin(angle2);
-    path2.push({ x, y });
-  }
-  return path2;
-}
-
 // node_modules/transformation-matrix/src/applyToPoint.js
 function applyToPoint(matrix, point2) {
   return Array.isArray(point2) ? [
@@ -5058,6 +5013,54 @@ 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 };
+  const end = { x: endX, y: endY };
+  const midX = (startX + endX) / 2;
+  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) {
+    return [start, end];
+  }
+  const h = Math.sqrt(radius * radius - distance2 * distance2 / 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);
+  const startAngle = Math.atan2(startY - centerY, startX - centerX);
+  let endAngle = Math.atan2(endY - centerY, endX - centerX);
+  if (sweepFlag && endAngle > startAngle) {
+    endAngle -= 2 * Math.PI;
+  } else if (!sweepFlag && endAngle < startAngle) {
+    endAngle += 2 * Math.PI;
+  }
+  if (!largeArcFlag && Math.abs(endAngle - startAngle) > Math.PI || largeArcFlag && Math.abs(endAngle - startAngle) < Math.PI) {
+    if (endAngle > startAngle) {
+      endAngle -= 2 * Math.PI;
+    } else {
+      endAngle += 2 * Math.PI;
+    }
+  }
+  const numPoints = Math.max(
+    2,
+    Math.ceil(Math.abs(endAngle - startAngle) * radius)
+  );
+  const path2 = [];
+  for (let i = 0; i <= numPoints; i++) {
+    const t = i / numPoints;
+    const angle2 = startAngle + t * (endAngle - startAngle);
+    const x = centerX + radius * Math.cos(angle2);
+    const y = centerY + radius * Math.sin(angle2);
+    path2.push({ x, y });
+  }
+  return path2;
+}
+
 // lib/utils/easyeda-unit-to-mm.ts
 var mil10ToMm = (value) => value * 10 * 0.0254;
 
@@ -5130,9 +5133,6 @@ var normalizePinLabels = (inputPinLabels) => {
   return result;
 };
 
-// lib/constants.ts
-var DEFAULT_PCB_THICKNESS_MM = 1.6;
-
 // lib/utils/normalize-symbol-name.ts
 var normalizeSymbolName = (name) => {
   const trimmedName = name.trim();
@@ -5142,6 +5142,9 @@ var normalizeSymbolName = (name) => {
 };
 
 // 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";
+var TSCIRCUIT_MODEL_CDN_URL = "https://modelcdn.tscircuit.com/easyeda_models";
 var mil2mm = (mil) => {
   if (typeof mil === "number") return mm(`${mil}mil`);
   if (mil.match(/^\d+$/)) return mm(`${mil}mil`);
@@ -5504,9 +5507,10 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
   const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
     (a) => Boolean(a.type === "SVGNODE" && a.svgData.attrs?.uuid)
   );
-  const objFileUuid = svgNode?.svgData?.attrs?.uuid;
-  const objFileUrl = objFileUuid ? useModelCdn ? `https://modelcdn.tscircuit.com/easyeda_models/download?uuid=${objFileUuid}&pn=${easyEdaJson.lcsc.number}` : `https://modules.easyeda.com/3dmodel/${objFileUuid}` : void 0;
-  if (objFileUrl !== void 0) {
+  const modelUuid = svgNode?.svgData?.attrs?.uuid;
+  const objFileUrl = modelUuid ? useModelCdn ? `${TSCIRCUIT_MODEL_CDN_URL}/assets/${easyEdaJson.lcsc.number}.obj?uuid=${modelUuid}` : `${EASYEDA_OBJ_MODEL_URL}/${modelUuid}` : void 0;
+  const stepFileUrl = modelUuid ? useModelCdn ? `${TSCIRCUIT_MODEL_CDN_URL}/assets/${easyEdaJson.lcsc.number}.step?uuid=${modelUuid}` : `${EASYEDA_STEP_MODEL_URL}/${modelUuid}` : void 0;
+  if (objFileUrl !== void 0 || stepFileUrl !== void 0) {
     const { position: position2, rotation: rotation2 } = parseCadOffsetsFromSvgNode(svgNode);
     circuitElements.push(
       cad_component.parse({
@@ -5523,7 +5527,8 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
         },
         position: { x: 0, y: 0, z: 0 },
         rotation: rotation2,
-        model_obj_url: objFileUrl
+        model_obj_url: objFileUrl,
+        model_step_url: stepFileUrl
       })
     );
   }
@@ -5660,9 +5665,11 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
 // lib/websafe/get-model-cdn-url.ts
 var getModelCdnUrl = ({
   easyedaModelUuid,
-  easyedaPartNumber
+  easyedaPartNumber,
+  format = "obj"
 }) => {
-  return `https://modelcdn.tscircuit.com/easyeda_models/download?uuid=${easyedaModelUuid}&pn=${easyedaPartNumber}`;
+  const extension = format === "step" ? "step" : "obj";
+  return `https://modelcdn.tscircuit.com/easyeda_models/assets/${easyedaPartNumber}.${extension}?uuid=${easyedaModelUuid}`;
 };
 
 // lib/websafe/fetch-easyeda-json.ts
@@ -5679,7 +5686,6 @@ var getModelUuidFromRawPackageDetail = (result) => {
         return modelUuid;
       }
     } catch {
-      continue;
     }
   }
   return null;
@@ -6540,6 +6546,120 @@ var EasyEdaJsonSchema = z163.object({
   }).optional()
 });
 
+// lib/utils/normalize-manufacturer-part-number.ts
+function normalizeManufacturerPartNumber(partNumber) {
+  let normalized = partNumber.replace(/[-]/g, "_").replace(/[^a-zA-Z0-9_$]/g, "_");
+  if (/^\d/.test(normalized)) {
+    normalized = "A_" + normalized;
+  }
+  return normalized;
+}
+
+// lib/websafe/get-easyeda-cad-model-placement.ts
+var placementCache = /* @__PURE__ */ new Map();
+var parseObjBounds2 = (objText) => {
+  let minX = Number.POSITIVE_INFINITY;
+  let minY = Number.POSITIVE_INFINITY;
+  let minZ = Number.POSITIVE_INFINITY;
+  let maxX = Number.NEGATIVE_INFINITY;
+  let maxY = Number.NEGATIVE_INFINITY;
+  let maxZ = Number.NEGATIVE_INFINITY;
+  let vertexCount = 0;
+  for (const line of objText.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("v ")) continue;
+    const [, xStr, yStr, zStr] = trimmed.split(/\s+/, 4);
+    const x = Number(xStr);
+    const y = Number(yStr);
+    const z164 = Number(zStr);
+    if (!Number.isFinite(x) || !Number.isFinite(y) || !Number.isFinite(z164)) {
+      continue;
+    }
+    vertexCount += 1;
+    minX = Math.min(minX, x);
+    minY = Math.min(minY, y);
+    minZ = Math.min(minZ, z164);
+    maxX = Math.max(maxX, x);
+    maxY = Math.max(maxY, y);
+    maxZ = Math.max(maxZ, z164);
+  }
+  if (vertexCount === 0) return null;
+  return {
+    min: { x: minX, y: minY, z: minZ },
+    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 partNumber = easyEdaJson.lcsc.number;
+  const svgNodeZOffsetMm = getSvgNodeZOffsetMm(easyEdaJson);
+  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !fetch2) {
+    return null;
+  }
+  const modelObjUrl = getModelCdnUrl({
+    easyedaModelUuid: modelUuid,
+    easyedaPartNumber: partNumber
+  });
+  const modelStepUrl = getModelCdnUrl({
+    easyedaModelUuid: modelUuid,
+    easyedaPartNumber: partNumber,
+    format: "step"
+  });
+  const metadataBounds = easyEdaJson._objMetadata?.bounds;
+  if (metadataBounds) {
+    return {
+      modelObjUrl,
+      modelStepUrl,
+      bounds: metadataBounds,
+      positionZMm: getPositionZMmFromBounds(metadataBounds, svgNodeZOffsetMm)
+    };
+  }
+  const cacheKey = `${modelObjUrl}::${svgNodeZOffsetMm}`;
+  const cachedPlacement = placementCache.get(cacheKey);
+  if (cachedPlacement) return cachedPlacement;
+  const placementPromise = (async () => {
+    try {
+      const response = await fetch2(modelObjUrl);
+      if (!response.ok) return null;
+      const objText = await response.text();
+      const bounds = parseObjBounds2(objText);
+      if (!bounds) return null;
+      return {
+        modelObjUrl,
+        modelStepUrl,
+        bounds,
+        // Align the EasyEDA SVG-node Z against the model's minimum Z.
+        positionZMm: getPositionZMmFromBounds(bounds, svgNodeZOffsetMm)
+      };
+    } catch (error) {
+      console.error(
+        `Error resolving EasyEDA CAD placement for ${partNumber}:`,
+        error
+      );
+      return null;
+    }
+  })();
+  placementCache.set(cacheKey, placementPromise);
+  return placementPromise;
+};
+
 // lib/websafe/generate-footprint-tsx.ts
 var generateFootprintTsx = (circuitJson) => {
   const holes = su(circuitJson).pcb_hole.list();
@@ -6623,6 +6743,7 @@ var generateTypescriptComponent = ({
   pinLabels,
   componentName,
   objUrl,
+  stepUrl,
   circuitJson,
   supplierPartNumbers,
   manufacturerPartNumber
@@ -6639,6 +6760,12 @@ var generateTypescriptComponent = ({
     })
   );
   const pinLabelsString = Object.entries(simplifiedPinLabels).map(([pin, labels]) => `  ${pin}: ${JSON.stringify(labels)}`).join(",\n");
+  const cadModelLines = [
+    objUrl ? `objUrl: "${objUrl}",` : "",
+    stepUrl ? `stepUrl: "${stepUrl}",` : "",
+    `pcbRotationOffset: ${cadComponent?.rotation?.z ?? 0},`,
+    `modelOriginPosition: { x: ${cadComponent?.model_origin_position?.x ?? 0}, y: ${cadComponent?.model_origin_position?.y ?? 0}, z: ${cadComponent?.model_origin_position?.z ?? 0} },`
+  ].filter(Boolean).map((line) => `        ${line}`).join("\n");
   return `
 import type { ChipProps } from "@tscircuit/props"
 
@@ -6653,10 +6780,8 @@ export const ${componentName} = (props: ChipProps<typeof pinLabels>) => {
       supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
       manufacturerPartNumber="${manufacturerPartNumber}"
       footprint={${footprintTsx}}
-      ${objUrl ? `cadModel={{
-        objUrl: "${objUrl}",
-        pcbRotationOffset: ${cadComponent?.rotation?.z ?? 0},
-        modelOriginPosition: { x: ${cadComponent?.model_origin_position?.x ?? 0}, y: ${cadComponent?.model_origin_position?.y ?? 0}, z: ${cadComponent?.model_origin_position?.z ?? 0} },
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
       }}` : ""}
       {...props}
     />
@@ -6665,123 +6790,21 @@ export const ${componentName} = (props: ChipProps<typeof pinLabels>) => {
 `.trim();
 };
 
-// lib/utils/normalize-manufacturer-part-number.ts
-function normalizeManufacturerPartNumber(partNumber) {
-  let normalized = partNumber.replace(/[-]/g, "_").replace(/[^a-zA-Z0-9_$]/g, "_");
-  if (/^\d/.test(normalized)) {
-    normalized = "A_" + normalized;
-  }
-  return normalized;
-}
-
-// lib/websafe/get-easyeda-cad-model-placement.ts
-var placementCache = /* @__PURE__ */ new Map();
-var parseObjBounds2 = (objText) => {
-  let minX = Number.POSITIVE_INFINITY;
-  let minY = Number.POSITIVE_INFINITY;
-  let minZ = Number.POSITIVE_INFINITY;
-  let maxX = Number.NEGATIVE_INFINITY;
-  let maxY = Number.NEGATIVE_INFINITY;
-  let maxZ = Number.NEGATIVE_INFINITY;
-  let vertexCount = 0;
-  for (const line of objText.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (!trimmed.startsWith("v ")) continue;
-    const [, xStr, yStr, zStr] = trimmed.split(/\s+/, 4);
-    const x = Number(xStr);
-    const y = Number(yStr);
-    const z164 = Number(zStr);
-    if (!Number.isFinite(x) || !Number.isFinite(y) || !Number.isFinite(z164)) {
-      continue;
-    }
-    vertexCount += 1;
-    minX = Math.min(minX, x);
-    minY = Math.min(minY, y);
-    minZ = Math.min(minZ, z164);
-    maxX = Math.max(maxX, x);
-    maxY = Math.max(maxY, y);
-    maxZ = Math.max(maxZ, z164);
-  }
-  if (vertexCount === 0) return null;
-  return {
-    min: { x: minX, y: minY, z: minZ },
-    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 partNumber = easyEdaJson.lcsc.number;
-  const svgNodeZOffsetMm = getSvgNodeZOffsetMm(easyEdaJson);
-  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !fetch2) {
-    return null;
-  }
-  const modelObjUrl = getModelCdnUrl({
-    easyedaModelUuid: modelUuid,
-    easyedaPartNumber: partNumber
-  });
-  const metadataBounds = easyEdaJson._objMetadata?.bounds;
-  if (metadataBounds) {
-    return {
-      modelObjUrl,
-      bounds: metadataBounds,
-      positionZMm: getPositionZMmFromBounds(metadataBounds, svgNodeZOffsetMm)
-    };
-  }
-  const cacheKey = `${modelObjUrl}::${svgNodeZOffsetMm}`;
-  const cachedPlacement = placementCache.get(cacheKey);
-  if (cachedPlacement) return cachedPlacement;
-  const placementPromise = (async () => {
-    try {
-      const response = await fetch2(modelObjUrl);
-      if (!response.ok) return null;
-      const objText = await response.text();
-      const bounds = parseObjBounds2(objText);
-      if (!bounds) return null;
-      return {
-        modelObjUrl,
-        bounds,
-        // Align the EasyEDA SVG-node Z against the model's minimum Z.
-        positionZMm: getPositionZMmFromBounds(bounds, svgNodeZOffsetMm)
-      };
-    } catch (error) {
-      console.error(
-        `Error resolving EasyEDA CAD placement for ${partNumber}:`,
-        error
-      );
-      return null;
-    }
-  })();
-  placementCache.set(cacheKey, placementPromise);
-  return placementPromise;
-};
-
 // lib/websafe/convert-to-typescript-component/index.tsx
-var convertRawEasyToTsx = async (rawEasy) => {
+var convertRawEasyToTsx = async ({
+  rawEasy,
+  format = "obj"
+}) => {
   const betterEasy = EasyEdaJsonSchema.parse(rawEasy);
   const result = await convertBetterEasyToTsx({
-    betterEasy
+    betterEasy,
+    format
   });
   return result;
 };
 var convertBetterEasyToTsx = async ({
-  betterEasy
+  betterEasy,
+  format = "obj"
 }) => {
   const cadPlacement = await getEasyEdaCadModelPlacement(betterEasy);
   const circuitJson = convertEasyEdaJsonToCircuitJson(betterEasy, {
@@ -6810,16 +6833,21 @@ var convertBetterEasyToTsx = async ({
     ];
   }
   let modelObjUrl;
+  let modelStepUrl;
   if (cadPlacement?.modelObjUrl) {
     modelObjUrl = cadPlacement.modelObjUrl;
+    modelStepUrl = cadPlacement.modelStepUrl;
   } else if (cadComponent?.model_obj_url) {
     const isValidUrl = await checkModelObjUrlValidity(
       cadComponent.model_obj_url
     );
     if (isValidUrl) {
       modelObjUrl = cadComponent.model_obj_url;
+      modelStepUrl = cadComponent.model_step_url;
     }
   }
+  const selectedObjUrl = format === "obj" ? modelObjUrl : void 0;
+  const selectedStepUrl = format === "step" ? modelStepUrl : void 0;
   const supplierPartNumbers = {
     jlcpcb: [betterEasy.lcsc.number]
   };
@@ -6827,7 +6855,8 @@ var convertBetterEasyToTsx = async ({
     componentName: pn,
     manufacturerPartNumber: pn,
     pinLabels,
-    objUrl: modelObjUrl,
+    objUrl: selectedObjUrl,
+    stepUrl: selectedStepUrl,
     circuitJson,
     supplierPartNumbers
   });