@tscircuit/cli 0.1.1493 → 0.1.1495

package/dist/cli/main.js

@@ -100763,7 +100763,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1492";
+var version = "0.1.1494";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -100814,7 +100814,7 @@ var package_default = {
     cosmiconfig: "^9.0.0",
     debug: "^4.4.0",
     delay: "^6.0.0",
-    "dsn-converter": "^0.0.88",
+    "dsn-converter": "^0.0.90",
     easyeda: "^0.0.269",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
@@ -252869,6 +252869,7 @@ import {
 
 // node_modules/dsn-converter/dist/index.js
 import { su as su13 } from "@tscircuit/soup-util";
+import { getBoundsFromPoints as getBoundsFromPoints3 } from "@tscircuit/math-utils";
 import { applyToPoint as applyToPoint25, scale as scale7 } from "transformation-matrix";
 import { su as su24 } from "@tscircuit/soup-util";
 import { su as su34 } from "@tscircuit/soup-util";
@@ -252995,6 +252996,24 @@ function createRectangularPadstack(name, width, height, layer) {
     attach: "off"
   };
 }
+function createPolygonPadstack({
+  name,
+  coordinates,
+  layer
+}) {
+  return {
+    name,
+    shapes: [
+      {
+        shapeType: "polygon",
+        layer: layer === "bottom" ? "B.Cu" : "F.Cu",
+        width: 0,
+        coordinates
+      }
+    ],
+    attach: "off"
+  };
+}
 function createCircularHoleRectangularPadstack(name, outerWidth, outerHeight, holeDiameter, numLayers = 2) {
   const halfWidth = outerWidth / 2;
   const halfHeight = outerHeight / 2;
@@ -253025,13 +253044,21 @@ function createCircularHoleRectangularPadstack(name, outerWidth, outerHeight, ho
     attach: "off"
   };
 }
+var padstackNamePrefixes = {
+  circle: "Round[",
+  oval: "Oval[",
+  pill: "Oval[",
+  rect: "RoundRect[",
+  polygon: "Cust["
+};
 function getPadstackName({
   shape,
   width,
   height,
   holeDiameter,
   outerDiameter,
-  layer = "top"
+  layer = "top",
+  customDescriptor
 }) {
   const layerCode = {
     top: "T",
@@ -253040,52 +253067,182 @@ function getPadstackName({
   }[layer] ?? "T";
   switch (shape) {
     case "circle":
-      return `Round[${layerCode}]Pad_${holeDiameter}_${outerDiameter}_um`;
+      return `${padstackNamePrefixes.circle}${layerCode}]Pad_${holeDiameter}_${outerDiameter}_um`;
     case "oval":
-      return `Oval[${layerCode}]Pad_${width}x${height}_um`;
+      return `${padstackNamePrefixes.oval}${layerCode}]Pad_${width}x${height}_um`;
     case "pill":
-      return `Oval[${layerCode}]Pad_${width}x${height}_um`;
+      return `${padstackNamePrefixes.pill}${layerCode}]Pad_${width}x${height}_um`;
     case "rect":
-      return `RoundRect[${layerCode}]Pad_${width}x${height}_um`;
+      return `${padstackNamePrefixes.rect}${layerCode}]Pad_${width}x${height}_um`;
+    case "polygon":
+      return `${padstackNamePrefixes.polygon}${layerCode}]Pad_${customDescriptor ?? `${width}x${height}`}_um`;
     default:
       return "default_pad";
   }
 }
-function createAndAddPadstackFromPcbSmtPad(pcb, pad2, processedPadstacks) {
+function roundMicrons(microns) {
+  return Number(microns.toFixed(3));
+}
+function getNormalizedPoints(points) {
+  if (points.length < 2)
+    return points;
+  const firstPoint = points[0];
+  const lastPoint = points[points.length - 1];
+  if (firstPoint.x === lastPoint.x && firstPoint.y === lastPoint.y) {
+    return points.slice(0, -1);
+  }
+  return points;
+}
+function getPolygonCentroid2(points) {
+  let signedArea3 = 0;
+  let centroidX = 0;
+  let centroidY = 0;
+  for (let index = 0;index < points.length; index++) {
+    const currentPoint = points[index];
+    const nextPoint = points[(index + 1) % points.length];
+    const crossProduct = currentPoint.x * nextPoint.y - nextPoint.x * currentPoint.y;
+    signedArea3 += crossProduct;
+    centroidX += (currentPoint.x + nextPoint.x) * crossProduct;
+    centroidY += (currentPoint.y + nextPoint.y) * crossProduct;
+  }
+  if (signedArea3 === 0)
+    return null;
+  const areaFactor = signedArea3 * 3;
+  return {
+    x: centroidX / areaFactor,
+    y: centroidY / areaFactor
+  };
+}
+function getPolygonSmtPadGeometry(pad2) {
+  const points = getNormalizedPoints(pad2.points);
+  const bounds = getBoundsFromPoints3(points);
+  if (!bounds) {
+    return {
+      center: { x: 0, y: 0 },
+      widthUm: 0,
+      heightUm: 0,
+      relativePointsUm: []
+    };
+  }
+  const { minX, maxX, minY, maxY } = bounds;
+  const polygonCentroid = getPolygonCentroid2(points);
+  const center2 = polygonCentroid ?? {
+    x: (minX + maxX) / 2,
+    y: (minY + maxY) / 2
+  };
+  const relativePointsUm = points.flatMap((point5) => [
+    roundMicrons((point5.x - center2.x) * 1000),
+    roundMicrons((point5.y - center2.y) * 1000)
+  ]);
+  if (points.length > 0) {
+    relativePointsUm.push(relativePointsUm[0], relativePointsUm[1]);
+  }
+  return {
+    center: center2,
+    widthUm: roundMicrons((maxX - minX) * 1000),
+    heightUm: roundMicrons((maxY - minY) * 1000),
+    relativePointsUm
+  };
+}
+function createAndAddPadstackFromPcbSmtPad({
+  pcb,
+  pad: pad2,
+  processedPadstacks
+}) {
   const isCircle = pad2.shape === "circle";
+  const isPolygon = pad2.shape === "polygon";
+  const polygonPadGeometry = isPolygon ? getPolygonSmtPadGeometry(pad2) : undefined;
+  let shape = "rect";
+  let outerDiameter;
+  let holeDiameter;
+  let width;
+  let height;
+  let customDescriptor;
+  if (isCircle) {
+    shape = "circle";
+    outerDiameter = pad2.radius * 1000 * 2;
+    holeDiameter = pad2.radius * 1000 * 2;
+  } else if (isPolygon) {
+    shape = "polygon";
+    width = polygonPadGeometry?.widthUm;
+    height = polygonPadGeometry?.heightUm;
+    customDescriptor = `${polygonPadGeometry?.widthUm}x${polygonPadGeometry?.heightUm}_${polygonPadGeometry?.relativePointsUm.join("_")}`;
+  } else {
+    width = pad2.width * 1000;
+    height = pad2.height * 1000;
+  }
   const padstackParams = {
-    shape: isCircle ? "circle" : "rect",
-    outerDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
-    holeDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
-    width: isCircle ? undefined : pad2.width * 1000,
-    height: isCircle ? undefined : pad2.height * 1000,
-    layer: pad2.layer
+    shape,
+    outerDiameter,
+    holeDiameter,
+    width,
+    height,
+    layer: pad2.layer,
+    customDescriptor
   };
   const padstackName = getPadstackName(padstackParams);
   if (!processedPadstacks.has(padstackName)) {
-    const padstack = isCircle ? createCircularPadstack(padstackName, padstackParams.outerDiameter, padstackParams.holeDiameter) : createRectangularPadstack(padstackName, padstackParams.width, padstackParams.height, pad2.layer);
+    let padstack;
+    if (isCircle) {
+      padstack = createCircularPadstack(padstackName, padstackParams.outerDiameter, padstackParams.holeDiameter);
+    } else if (isPolygon) {
+      padstack = createPolygonPadstack({
+        name: padstackName,
+        coordinates: polygonPadGeometry.relativePointsUm,
+        layer: pad2.layer
+      });
+    } else {
+      padstack = createRectangularPadstack(padstackName, padstackParams.width, padstackParams.height, pad2.layer);
+    }
     pcb.library.padstacks.push(padstack);
     processedPadstacks.add(padstackName);
   }
   return padstackName;
 }
-function createPinForImage(pad2, pcbComponent, sourcePort) {
+function createPinForImage({
+  pad: pad2,
+  pcbComponent,
+  sourcePort
+}) {
   if (!sourcePort)
     return;
   const isCircle = pad2.shape === "circle";
+  const isPolygon = pad2.shape === "polygon";
+  const polygonPadGeometry = isPolygon ? getPolygonSmtPadGeometry(pad2) : undefined;
+  let shape = "rect";
+  let outerDiameter;
+  let holeDiameter;
+  let width;
+  let height;
+  let customDescriptor;
+  if (isCircle) {
+    shape = "circle";
+    outerDiameter = pad2.radius * 1000 * 2;
+    holeDiameter = pad2.radius * 1000 * 2;
+  } else if (isPolygon) {
+    shape = "polygon";
+    width = polygonPadGeometry?.widthUm;
+    height = polygonPadGeometry?.heightUm;
+    customDescriptor = `${polygonPadGeometry?.widthUm}x${polygonPadGeometry?.heightUm}_${polygonPadGeometry?.relativePointsUm.join("_")}`;
+  } else {
+    width = pad2.width * 1000;
+    height = pad2.height * 1000;
+  }
   const padstackParams = {
-    shape: isCircle ? "circle" : "rect",
-    outerDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
-    holeDiameter: isCircle ? pad2.radius * 1000 * 2 : undefined,
-    width: isCircle ? undefined : pad2.width * 1000,
-    height: isCircle ? undefined : pad2.height * 1000,
-    layer: pad2.layer
+    shape,
+    outerDiameter,
+    holeDiameter,
+    width,
+    height,
+    layer: pad2.layer,
+    customDescriptor
   };
+  const padCenter = isPolygon ? polygonPadGeometry.center : { x: pad2.x, y: pad2.y };
   return {
     padstack_name: getPadstackName(padstackParams),
     pin_number: sourcePort.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
-    x: (pad2.x - pcbComponent.center.x) * 1000,
-    y: (pad2.y - pcbComponent.center.y) * 1000
+    x: (padCenter.x - pcbComponent.center.x) * 1000,
+    y: (padCenter.y - pcbComponent.center.y) * 1000
   };
 }
 function getComponentValue(sourceComponent) {
@@ -253145,7 +253302,11 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     if (!componentGroup)
       continue;
     for (const pad2 of componentGroup.pcb_smtpads) {
-      createAndAddPadstackFromPcbSmtPad(pcb, pad2, processedPadstacks);
+      createAndAddPadstackFromPcbSmtPad({
+        pcb,
+        pad: pad2,
+        processedPadstacks
+      });
     }
     const image = {
       name: footprintName,
@@ -253154,7 +253315,11 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
         const pcbComponent = circuitElements.find((e4) => e4.type === "pcb_component" && e4.source_component_id === firstComponent.sourceComponent?.source_component_id);
         const pcbPort = su13(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
         const sourcePort = su13(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
-        return createPinForImage(pad2, pcbComponent, sourcePort);
+        return createPinForImage({
+          pad: pad2,
+          pcbComponent,
+          sourcePort
+        });
       }).filter((pin) => pin !== undefined)
     };
     pcb.library.images.push(image);
@@ -265222,7 +265387,7 @@ var getBoundsCenter = (bounds) => ({
   x: (bounds.minX + bounds.maxX) / 2,
   y: (bounds.minY + bounds.maxY) / 2
 });
-var getBoundsFromPoints3 = (points) => {
+var getBoundsFromPoints4 = (points) => {
   if (points.length === 0) {
     return null;
   }
@@ -265288,7 +265453,7 @@ var getEasyEdaModelOriginOnBoardMm = ({
   }
   let modelOriginMm = null;
   if (points.length > 0) {
-    const bounds = getBoundsFromPoints3(points);
+    const bounds = getBoundsFromPoints4(points);
     modelOriginMm = bounds ? getBoundsCenter(bounds) : null;
   } else {
     const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
@@ -272005,7 +272170,7 @@ var getBoundsCenter2 = (bounds) => ({
   x: (bounds.minX + bounds.maxX) / 2,
   y: (bounds.minY + bounds.maxY) / 2
 });
-var getBoundsFromPoints4 = (points) => {
+var getBoundsFromPoints5 = (points) => {
   if (points.length === 0) {
     return null;
   }
@@ -272071,7 +272236,7 @@ var getEasyEdaModelOriginOnBoardMm2 = ({
   }
   let modelOriginMm = null;
   if (points.length > 0) {
-    const bounds = getBoundsFromPoints4(points);
+    const bounds = getBoundsFromPoints5(points);
     modelOriginMm = bounds ? getBoundsCenter2(bounds) : null;
   } else {
     const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));

package/dist/lib/index.js

@@ -65808,7 +65808,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1492";
+var version = "0.1.1494";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65859,7 +65859,7 @@ var package_default = {
     cosmiconfig: "^9.0.0",
     debug: "^4.4.0",
     delay: "^6.0.0",
-    "dsn-converter": "^0.0.88",
+    "dsn-converter": "^0.0.90",
     easyeda: "^0.0.269",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1493",
+  "version": "0.1.1495",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -48,7 +48,7 @@
     "cosmiconfig": "^9.0.0",
     "debug": "^4.4.0",
     "delay": "^6.0.0",
-    "dsn-converter": "^0.0.88",
+    "dsn-converter": "^0.0.90",
     "easyeda": "^0.0.269",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",