easyeda 0.0.251 → 0.0.253

package/dist/browser/index.d.ts

@@ -2245,13 +2245,11 @@ declare const EasyEdaJsonSchema: z.ZodObject<{
 type RawEasyEdaJson = z.input<typeof EasyEdaJsonSchema>;
 type BetterEasyEdaJson = z.infer<typeof EasyEdaJsonSchema>;
 
-declare const convertRawEasyToTsx: ({ rawEasy, format, }: {
+declare const convertRawEasyToTsx: ({ rawEasy }: {
     rawEasy: any;
-    format?: "obj" | "step";
 }) => Promise<string>;
-declare const convertBetterEasyToTsx: ({ betterEasy, format, }: {
+declare const convertBetterEasyToTsx: ({ betterEasy, }: {
     betterEasy: BetterEasyEdaJson;
-    format?: "obj" | "step";
 }) => Promise<string>;
 
 declare function fetchEasyEDAComponent(jlcpcbPartNumber: string, { fetch, includeModelMetadata, }?: {
@@ -2264,8 +2262,9 @@ declare const generateFootprintTsx: (circuitJson: AnyCircuitElement[]) => string
 type Params = {
     easyedaPartNumber: string;
     easyedaModelUuid: string;
-    format?: "obj" | "step";
 };
-declare const getModelCdnUrl: ({ easyedaModelUuid, easyedaPartNumber, format, }: Params) => string;
+declare const getModelObjCdnUrl: ({ easyedaModelUuid, easyedaPartNumber, }: Params) => string;
+declare const getModelStepCdnUrl: ({ easyedaModelUuid, easyedaPartNumber, }: Params) => string;
+declare const getModelCdnUrl: ({ easyedaModelUuid, easyedaPartNumber, }: Params) => string;
 
-export { convertBetterEasyToTsx, convertRawEasyToTsx, fetchEasyEDAComponent, generateFootprintTsx, getModelCdnUrl };
+export { convertBetterEasyToTsx, convertRawEasyToTsx, fetchEasyEDAComponent, generateFootprintTsx, getModelCdnUrl, getModelObjCdnUrl, getModelStepCdnUrl };

package/dist/browser/index.js

@@ -9159,7 +9159,13 @@ 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
+} = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
   const circuitElements = [];
   const source_component = any_source_component.parse({
@@ -9404,8 +9410,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,15 +10299,106 @@ 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 getModelCdnUrl = ({
+var getModelObjCdnUrl = ({
   easyedaModelUuid,
-  easyedaPartNumber,
-  format = "obj"
+  easyedaPartNumber
 }) => {
-  const extension = format === "step" ? "step" : "obj";
-  return `https://modelcdn.tscircuit.com/easyeda_models/assets/${easyedaPartNumber}.${extension}?uuid=${easyedaModelUuid}`;
+  return `https://modelcdn.tscircuit.com/easyeda_models/assets/${easyedaPartNumber}.obj?uuid=${easyedaModelUuid}`;
 };
+var getModelStepCdnUrl = ({
+  easyedaModelUuid,
+  easyedaPartNumber
+}) => {
+  return `https://modelcdn.tscircuit.com/easyeda_models/assets/${easyedaPartNumber}.step?uuid=${easyedaModelUuid}`;
+};
+var getModelCdnUrl = getModelObjCdnUrl;
 
 // lib/websafe/get-easyeda-cad-model-placement.ts
 var placementCache = /* @__PURE__ */ new Map();
@@ -10337,43 +10434,32 @@ 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 = getModelCdnUrl({
+  const modelObjUrl = getModelObjCdnUrl({
     easyedaModelUuid: modelUuid,
     easyedaPartNumber: partNumber
   });
-  const modelStepUrl = getModelCdnUrl({
+  const modelStepUrl = getModelStepCdnUrl({
     easyedaModelUuid: modelUuid,
-    easyedaPartNumber: partNumber,
-    format: "step"
+    easyedaPartNumber: partNumber
   });
   const metadataBounds = easyEdaJson._objMetadata?.bounds;
   if (metadataBounds) {
     return {
       modelObjUrl,
+      positionXMm: derivedOffsetMm.x,
+      positionYMm: derivedOffsetMm.y,
       modelStepUrl,
       bounds: metadataBounds,
       positionZMm: getPositionZMmFromBounds(metadataBounds, svgNodeZOffsetMm)
@@ -10391,6 +10477,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.
@@ -10539,25 +10627,22 @@ ${cadModelLines}
 };
 
 // lib/websafe/convert-to-typescript-component/index.tsx
-var convertRawEasyToTsx = async ({
-  rawEasy,
-  format = "obj"
-}) => {
+var convertRawEasyToTsx = async ({ rawEasy }) => {
   const betterEasy = EasyEdaJsonSchema.parse(rawEasy);
   const result = await convertBetterEasyToTsx({
-    betterEasy,
-    format
+    betterEasy
   });
   return result;
 };
 var convertBetterEasyToTsx = async ({
-  betterEasy,
-  format = "obj"
+  betterEasy
 }) => {
   const cadPlacement = await getEasyEdaCadModelPlacement(betterEasy);
   const circuitJson = convertEasyEdaJsonToCircuitJson(betterEasy, {
     useModelCdn: true,
     shouldRecenter: true,
+    cadPositionXMm: cadPlacement?.positionXMm,
+    cadPositionYMm: cadPlacement?.positionYMm,
     cadPositionZMm: cadPlacement?.positionZMm
   });
   const [cadComponent] = su(circuitJson).cad_component.list();
@@ -10594,8 +10679,6 @@ var convertBetterEasyToTsx = async ({
       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]
   };
@@ -10603,8 +10686,8 @@ var convertBetterEasyToTsx = async ({
     componentName: pn,
     manufacturerPartNumber: pn,
     pinLabels,
-    objUrl: selectedObjUrl,
-    stepUrl: selectedStepUrl,
+    objUrl: modelObjUrl,
+    stepUrl: modelStepUrl,
     circuitJson,
     supplierPartNumbers
   });
@@ -10753,6 +10836,8 @@ export {
   convertRawEasyToTsx,
   fetchEasyEDAComponent,
   generateFootprintTsx,
-  getModelCdnUrl
+  getModelCdnUrl,
+  getModelObjCdnUrl,
+  getModelStepCdnUrl
 };
 //# sourceMappingURL=index.js.map