@tscircuit/cli 0.1.1169 → 0.1.1170

package/dist/cli/main.js

@@ -98452,7 +98452,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "0.0.86",
-    easyeda: "^0.0.252",
+    easyeda: "^0.0.253",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -254917,7 +254917,13 @@ var getCadPositionZMmFromMetadata = (easyEdaJson) => {
   const minZ = Math.abs(bounds.min.z) < 0.000001 ? 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_component2.parse({
@@ -255140,8 +255146,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 ?? position22.z
       },
       position: { x: 0, y: 0, z: 0 },
@@ -255997,6 +256003,90 @@ function normalizeManufacturerPartNumber(partNumber) {
   }
   return normalized;
 }
+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) < 0.000001;
+var isZeroishFootprintDelta = (value) => Math.abs(value) < 0.001;
+var getPadCenter = (easyEdaJson) => {
+  const pads = easyEdaJson.packageDetail.dataStr.shape.filter((shape) => shape.type === "PAD");
+  if (pads.length === 0)
+    return null;
+  const xs3 = pads.map((pad2) => parseMil10Value(pad2.center.x));
+  const ys3 = pads.map((pad2) => parseMil10Value(pad2.center.y));
+  return {
+    x: (Math.min(...xs3) + Math.max(...xs3)) / 2,
+    y: (Math.min(...ys3) + Math.max(...ys3)) / 2
+  };
+};
+var getRotatedOffsetMm = ({
+  bounds,
+  rawOffsetMil,
+  rotationDeg
+}) => {
+  const center2 = getBoundsCenter(bounds);
+  const offsetX = milToMm(rawOffsetMil.x);
+  const offsetY = milToMm(rawOffsetMil.y);
+  switch (rotationDeg) {
+    case 0:
+      return { x: center2.x + offsetX, y: center2.y + offsetY };
+    case 90:
+      return { x: center2.x + offsetY, y: center2.y + offsetX };
+    case 180:
+      return { x: center2.x - offsetX, y: center2.y - offsetY };
+    case 270:
+      return { x: center2.x - offsetY, y: center2.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;
 var getModelObjCdnUrl = ({
   easyedaModelUuid,
   easyedaPartNumber
@@ -256045,27 +256135,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) < 0.000001 ? 0 : bounds.min.z;
   return minZ - svgNodeZOffsetMm;
 };
 var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = 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 || !fetch22) {
+  const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
+  const svgNodeZOffsetMm = getCadSvgNodeZOffsetMm(easyEdaJson);
+  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !derivedOffsetMm || !fetch22) {
     return null;
   }
   const modelObjUrl = getModelObjCdnUrl({
@@ -256080,6 +256159,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = globalT
   if (metadataBounds) {
     return {
       modelObjUrl,
+      positionXMm: derivedOffsetMm.x,
+      positionYMm: derivedOffsetMm.y,
       modelStepUrl,
       bounds: metadataBounds,
       positionZMm: getPositionZMmFromBounds(metadataBounds, svgNodeZOffsetMm)
@@ -256100,6 +256181,8 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = globalT
         return null;
       return {
         modelObjUrl,
+        positionXMm: derivedOffsetMm.x,
+        positionYMm: derivedOffsetMm.y,
         modelStepUrl,
         bounds,
         positionZMm: getPositionZMmFromBounds(bounds, svgNodeZOffsetMm)
@@ -256231,6 +256314,8 @@ var convertBetterEasyToTsx = async ({
   const circuitJson = convertEasyEdaJsonToCircuitJson(betterEasy, {
     useModelCdn: true,
     shouldRecenter: true,
+    cadPositionXMm: cadPlacement?.positionXMm,
+    cadPositionYMm: cadPlacement?.positionYMm,
     cadPositionZMm: cadPlacement?.positionZMm
   });
   const [cadComponent] = su8(circuitJson).cad_component.list();
@@ -261342,7 +261427,13 @@ var getCadPositionZMmFromMetadata2 = (easyEdaJson) => {
   const minZ = Math.abs(bounds.min.z) < 0.000001 ? 0 : bounds.min.z;
   return minZ - mil10ToMm2(svgNodeZ);
 };
-var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, { useModelCdn, shouldRecenter = true, cadPositionZMm } = {}) => {
+var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
+  useModelCdn,
+  shouldRecenter = true,
+  cadPositionXMm,
+  cadPositionYMm,
+  cadPositionZMm
+} = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata2(easyEdaJson);
   const circuitElements = [];
   const source_component = any_source_component3.parse({
@@ -261565,8 +261656,8 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, { useModelCdn, shouldRecent
       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 ?? position22.z
       },
       position: { x: 0, y: 0, z: 0 },

package/dist/lib/index.js

@@ -60721,7 +60721,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "0.0.86",
-    easyeda: "^0.0.252",
+    easyeda: "^0.0.253",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1169",
+  "version": "0.1.1170",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -40,7 +40,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "0.0.86",
-    "easyeda": "^0.0.252",
+    "easyeda": "^0.0.253",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",