@tscircuit/parts-engine 0.0.20 → 0.0.22

package/dist/index.js

@@ -8869,11 +8869,11 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
   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) {
+  const distance3 = Math.sqrt(dx * dx + dy * dy);
+  if (distance3 === 0 || radius < distance3 / 2) {
     return [start, end];
   }
-  const h = Math.sqrt(radius * radius - distance2 * distance2 / 4);
+  const h = Math.sqrt(radius * radius - distance3 * distance3 / 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);
@@ -8906,6 +8906,121 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
   return path;
 }
 var mil10ToMm = (value) => value * 10 * 0.0254;
+var getBoundsCenter = (bounds) => ({
+  x: (bounds.minX + bounds.maxX) / 2,
+  y: (bounds.minY + bounds.maxY) / 2
+});
+var getBoundsFromPoints = (points) => {
+  if (points.length === 0) {
+    return null;
+  }
+  let minX = points[0].x;
+  let minY = points[0].y;
+  let maxX = points[0].x;
+  let maxY = points[0].y;
+  for (let i = 1; i < points.length; i++) {
+    const point2 = points[i];
+    if (point2.x < minX) minX = point2.x;
+    if (point2.y < minY) minY = point2.y;
+    if (point2.x > maxX) maxX = point2.x;
+    if (point2.y > maxY) maxY = point2.y;
+  }
+  return { minX, minY, maxX, maxY };
+};
+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 isSvgChildNodeWithAttrs = (childNode) => typeof childNode === "object" && childNode !== null;
+var getXyBoundsFromModelBounds = (bounds) => ({
+  minX: bounds.min.x,
+  minY: bounds.min.y,
+  maxX: bounds.max.x,
+  maxY: bounds.max.y
+});
+var rotateScenePoint = (point2, rotationDeg) => {
+  switch (rotationDeg) {
+    case 0:
+      return point2;
+    case 90:
+      return { x: point2.y, y: -point2.x };
+    case 180:
+      return { x: -point2.x, y: -point2.y };
+    case 270:
+      return { x: -point2.y, y: point2.x };
+  }
+};
+var getEasyEdaModelOriginOnBoardMm = ({
+  svgNode,
+  footprintCenterMm
+}) => {
+  const points = [];
+  for (const childNode of svgNode.svgData.childNodes ?? []) {
+    if (!isSvgChildNodeWithAttrs(childNode)) continue;
+    const rawPoints = childNode.attrs?.points;
+    if (!rawPoints) continue;
+    const values = String(rawPoints).trim().split(/\s+/).map(Number);
+    for (let i = 0; i + 1 < values.length; i += 2) {
+      const x = values[i];
+      const y = values[i + 1];
+      if (Number.isFinite(x) && Number.isFinite(y)) {
+        points.push({ x: mil10ToMm(x), y: mil10ToMm(y) });
+      }
+    }
+  }
+  let modelOriginMm = null;
+  if (points.length > 0) {
+    const bounds = getBoundsFromPoints(points);
+    modelOriginMm = bounds ? getBoundsCenter(bounds) : null;
+  } else {
+    const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
+    if (Number.isFinite(originX) && Number.isFinite(originY)) {
+      modelOriginMm = { x: mil10ToMm(originX), y: mil10ToMm(originY) };
+    }
+  }
+  if (!modelOriginMm) return null;
+  return {
+    x: modelOriginMm.x - footprintCenterMm.x,
+    y: footprintCenterMm.y - modelOriginMm.y
+  };
+};
+var snapZero = (value) => Math.abs(value) < 1e-6 ? 0 : value;
+var normalizePoint = (point2) => ({
+  x: snapZero(point2.x),
+  y: snapZero(point2.y)
+});
+var getCadModelOffsetMmFromBounds = (easyEdaJson, bounds, {
+  footprintBoundsCenterMm
+} = {}) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
+  if (!svgNode || !bounds) 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(getXyBoundsFromModelBounds(bounds));
+  const footprintCenter = easyEdaJson.packageDetail.dataStr.head;
+  const footprintCenterMm = footprintBoundsCenterMm ?? {
+    x: mil10ToMm(footprintCenter.x),
+    y: mil10ToMm(footprintCenter.y)
+  };
+  const targetOriginOnBoardMm = getEasyEdaModelOriginOnBoardMm({
+    svgNode,
+    footprintCenterMm
+  });
+  if (!targetOriginOnBoardMm) return null;
+  const targetOriginInModelFrame = rotateScenePoint(
+    targetOriginOnBoardMm,
+    rotationDeg
+  );
+  return normalizePoint({
+    x: modelCenter.x - targetOriginInModelFrame.x,
+    y: modelCenter.y - targetOriginInModelFrame.y
+  });
+};
 var normalizePinLabels = (inputPinLabels) => {
   const uniqueInputPinLabels = inputPinLabels.map((labels) => [
     ...new Set(labels)
@@ -9076,13 +9191,14 @@ var handleHoleCutout = (hole, index) => {
   });
 };
 var handleVia = (via, index) => {
+  const holeDiameter = via.holeRadius * 2;
   return pcb_via.parse({
     type: "pcb_via",
     pcb_via_id: `pcb_via_${index + 1}`,
     x: milx10(via.center.x),
     y: milx10(via.center.y),
     outer_diameter: milx10(via.outerDiameter),
-    hole_diameter: milx10(via.holeDiameter),
+    hole_diameter: milx10(holeDiameter),
     layers: ["top", "bottom"]
   });
 };
@@ -9097,6 +9213,10 @@ var handleCutout = (solidRegion, index) => {
     }))
   });
 };
+var LEAD_SHAPE_LAYER = 100;
+var isPcbSolidRegionCutout = (shape) => {
+  return shape.fillStyle === "cutout" && shape.layermask !== LEAD_SHAPE_LAYER;
+};
 var getCadPositionZMmFromMetadata = (easyEdaJson) => {
   const svgNode = easyEdaJson.packageDetail.dataStr.shape.find(
     (shape) => shape.type === "SVGNODE" && shape.svgData.attrs?.uuid
@@ -9115,6 +9235,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   cadPositionXMm,
   cadPositionYMm,
   cadPositionZMm,
+  cadModelBounds,
   showDesignator = false
 } = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
@@ -9194,15 +9315,12 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         const innerWidth = largestOuterDimensionName === "width" ? largestInnerDimension : smallestInnerDimension;
         const innerHeight = largestOuterDimensionName === "height" ? largestInnerDimension : smallestInnerDimension;
         additionalPlatedHoleProps = {
-          shape: "pill_hole_with_rect_pad",
-          hole_shape: "pill",
-          pad_shape: "rect",
+          shape: "pill",
           hole_width: innerWidth,
           hole_height: innerHeight,
-          rect_pad_width: mil2mm(pad.width),
-          rect_pad_height: mil2mm(pad.height),
-          hole_offset_x: 0,
-          hole_offset_y: 0
+          outer_width: mil2mm(pad.width),
+          outer_height: mil2mm(pad.height),
+          ccw_rotation: pad.rotation || 0
         };
       } else if (pad.shape === "RECT") {
         const padWidth = mil2mm(pad.width);
@@ -9256,7 +9374,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
       } else if (pad.shape === "ELLIPSE") {
         soupShape = "rect";
       } else if (pad.shape === "OVAL") {
-        soupShape = "rect";
+        soupShape = "pill";
       } else if (pad.shape === "POLYGON") {
         soupShape = "polygon";
       }
@@ -9276,12 +9394,17 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
           x: mil2mm(pad.center.x),
           y: mil2mm(pad.center.y)
         },
-        ...soupShape === "rect" ? rectSize : soupShape === "polygon" && pad.points ? {
+        ...soupShape === "rect" ? rectSize : soupShape === "pill" ? {
+          ...rectSize,
+          radius: Math.min(rectSize.width, rectSize.height) / 2
+        } : soupShape === "polygon" && pad.points ? {
           points: pad.points.map((p) => ({
             x: milx10(p.x),
             y: milx10(p.y)
           }))
-        } : { radius: Math.min(mil2mm(pad.width), mil2mm(pad.height)) / 2 },
+        } : {
+          radius: Math.min(mil2mm(pad.width), mil2mm(pad.height)) / 2
+        },
         layer: "top",
         port_hints: [`pin${pinNumber}`],
         pcb_component_id: "pcb_component_1",
@@ -9300,7 +9423,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     circuitElements.push(handleVia(v, index));
   });
   easyEdaJson.packageDetail.dataStr.shape.filter(
-    (shape) => shape.type === "SOLIDREGION" && shape.fillStyle === "cutout"
+    (shape) => shape.type === "SOLIDREGION" && isPcbSolidRegionCutout(shape)
   ).forEach((sr, index) => {
     circuitElements.push(handleCutout(sr, index));
   });
@@ -9352,7 +9475,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     circuitElements.push(
       pcb_silkscreen_text.parse({
         type: "pcb_silkscreen_text",
-        pcb_silkscreen_text_id: `pcb_silkscreen_text_designator_fallback`,
+        pcb_silkscreen_text_id: "pcb_silkscreen_text_designator_fallback",
         pcb_component_id: "pcb_component_1",
         text: "{NAME}",
         anchor_position: {
@@ -9470,6 +9593,14 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         if (!cad.model_origin_position) {
           cad.model_origin_position = { x: 0, y: 0, z: 0 };
         }
+        const resolvedCadModelBounds = cadModelBounds ?? easyEdaJson._objMetadata?.bounds;
+        const recenteredCadOffset = resolvedCadModelBounds && getCadModelOffsetMmFromBounds(easyEdaJson, resolvedCadModelBounds, {
+          footprintBoundsCenterMm: bounds.center
+        });
+        if (recenteredCadOffset) {
+          cad.model_origin_position.x = recenteredCadOffset.x;
+          cad.model_origin_position.y = recenteredCadOffset.y;
+        }
         const side = pcb_component2.layer ?? "top";
         const t = DEFAULT_PCB_THICKNESS_MM / 2;
         const attrs = svgNode?.svgData?.attrs ?? {};
@@ -9623,7 +9754,7 @@ var ViaSchema = BaseShapeSchema.extend({
   type: external_exports.literal("VIA"),
   center: PointSchema,
   outerDiameter: external_exports.number(),
-  holeDiameter: external_exports.number()
+  holeRadius: external_exports.number()
 });
 var RectSchema = BaseShapeSchema.extend({
   type: external_exports.literal("RECT"),
@@ -9773,13 +9904,13 @@ var ShapeItemSchema = external_exports.object({
       });
     }
     case "VIA": {
-      const [x, y, outerDiameter, , holeDiameter, id] = shape.data.split("~");
+      const [x, y, outerDiameter, , holeRadius, id] = shape.data.split("~");
       const center = [Number(x), Number(y)];
       return ViaSchema.parse({
         type: "VIA",
         center,
         outerDiameter: Number(outerDiameter),
-        holeDiameter: Number(holeDiameter),
+        holeRadius: Number(holeRadius),
         id
       });
     }
@@ -10035,6 +10166,12 @@ var parsePath = (str) => {
   };
 };
 var PathShapeSchema = external_exports.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
+var optionalEasyEdaTextField = (fieldSchema) => external_exports.preprocess((textField) => {
+  if (textField == null || textField === "" || textField === "undefined") {
+    return void 0;
+  }
+  return textField;
+}, fieldSchema);
 var TextShapeOutputSchema = external_exports.object({
   type: external_exports.literal("TEXT"),
   alignment: external_exports.enum(["L", "C", "R"]),
@@ -10042,11 +10179,13 @@ var TextShapeOutputSchema = external_exports.object({
   y: external_exports.number(),
   rotation: external_exports.number(),
   fontColor: external_exports.string(),
-  backgroundColor: external_exports.string().optional(),
+  backgroundColor: optionalEasyEdaTextField(external_exports.string().optional()),
   fontSize: external_exports.string(),
-  fontWeight: external_exports.string().optional().default("normal"),
-  fontStyle: external_exports.enum(["normal", "italic"]).optional().default("normal"),
-  fontDecoration: external_exports.string().optional().default(""),
+  fontWeight: optionalEasyEdaTextField(external_exports.string().optional().default("normal")),
+  fontStyle: optionalEasyEdaTextField(
+    external_exports.enum(["normal", "italic"]).optional().default("normal")
+  ),
+  fontDecoration: optionalEasyEdaTextField(external_exports.string().optional().default("")),
   content: external_exports.string(),
   textType: external_exports.string(),
   visibility: external_exports.enum(["0", "1"]),
@@ -10079,11 +10218,11 @@ var parseText = (str) => {
     y: Number(y),
     rotation: Number(rotation2),
     fontColor,
-    backgroundColor: backgroundColor || void 0,
+    backgroundColor,
     fontSize,
-    fontWeight: fontWeight || "normal",
-    fontStyle: fontStyle || "normal",
-    fontDecoration: fontDecoration || "",
+    fontWeight,
+    fontStyle,
+    fontDecoration,
     content,
     textType,
     visibility,
@@ -10250,6 +10389,7 @@ var EasyEdaJsonSchema = external_exports.object({
   lcsc: LcscSchema,
   owner: OwnerSchema,
   tags: external_exports.array(external_exports.string()),
+  category: external_exports.string().optional(),
   updateTime: external_exports.number(),
   updated_at: external_exports.string(),
   dataStr: DataStrSchema,