@tscircuit/cli 0.1.2231 → 0.1.2232

package/dist/cli/main.js

@@ -154298,7 +154298,7 @@ var import_perfect_cli = __toESM3(require_dist3(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.2230";
+var version = "0.1.2231";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -154367,7 +154367,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.366",
+    easyeda: "^0.0.368",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -363942,6 +363942,29 @@ function compose27(...matrices) {
   return transform2(...matrices);
 }
 var { cos: cos3, sin: sin3, PI: PI3 } = Math;
+function rotate20(angle, cx, cy) {
+  const cosAngle = cos3(angle);
+  const sinAngle = sin3(angle);
+  const rotationMatrix = {
+    a: cosAngle,
+    c: -sinAngle,
+    e: 0,
+    b: sinAngle,
+    d: cosAngle,
+    f: 0
+  };
+  if (isUndefined3(cx) || isUndefined3(cy)) {
+    return rotationMatrix;
+  }
+  return transform2([
+    translate26(cx, cy),
+    rotationMatrix,
+    translate26(-cx, -cy)
+  ]);
+}
+function rotateDEG2(angle, cx = undefined, cy = undefined) {
+  return rotate20(angle * PI3 / 180, cx, cy);
+}
 function scale14(sx, sy = undefined, cx = undefined, cy = undefined) {
   if (isUndefined3(sy))
     sy = sx;
@@ -365428,6 +365451,95 @@ var PIN1_LOCATION_PARTS = {
   bottomside_right: { side: "bottomside", alignment: "right" }
 };
 var PIN1_LOCATIONS2 = Object.keys(PIN1_LOCATION_PARTS);
+var unitToMm3 = {
+  in: 25.4,
+  inch: 25.4,
+  mil: 0.0254,
+  mm: 1,
+  m: 1000,
+  cm: 10,
+  ft: 304.8,
+  feet: 304.8
+};
+var mmNumberFormatter = new Intl.NumberFormat("en-US", {
+  useGrouping: false,
+  notation: "standard",
+  maximumFractionDigits: 12
+});
+var mm4 = (n) => {
+  let unit = typeof n === "number" ? "mm" : n.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
+  if (!unit)
+    unit = "mm";
+  const val = typeof n === "number" ? n : Number.parseFloat(n.split(unit)[0]);
+  if (unit in unitToMm3) {
+    return val * unitToMm3[unit];
+  }
+  throw new Error(`Unsupported unit: ${unit}`);
+};
+var mmStr2 = (n) => {
+  return `${mmNumberFormatter.format(mm4(n))}mm`;
+};
+var mil2mm = (mil) => {
+  if (typeof mil === "number")
+    return mm4(`${mil}mil`);
+  if (mil.match(/^\d+$/))
+    return mm4(`${mil}mil`);
+  return mm4(mil);
+};
+var getEasyEdaPlatedHoleGeometry = (pad) => {
+  const holeDiameterMm = mil2mm(pad.holeRadius) * 2;
+  const holeLengthMm = pad.holeLength ? mil2mm(pad.holeLength) : 0;
+  let holeWidthMm = holeDiameterMm;
+  let holeHeightMm = holeDiameterMm;
+  if (holeLengthMm > holeDiameterMm) {
+    if (!pad.holePoints) {
+      throw new Error(`Slot on pad ${pad.number} is missing hole endpoints`);
+    }
+    const [start, end] = pad.holePoints;
+    const localHoleDirection = applyToPoint106(rotateDEG2(pad.rotation), {
+      x: end.x - start.x,
+      y: end.y - start.y
+    });
+    const absX = Math.abs(localHoleDirection.x);
+    const absY = Math.abs(localHoleDirection.y);
+    if (Math.min(absX, absY) > Math.max(absX, absY) * 0.001) {
+      throw new Error(`Slot on pad ${pad.number} is not aligned with its pad`);
+    }
+    if (absX > absY)
+      holeWidthMm = holeLengthMm;
+    else
+      holeHeightMm = holeLengthMm;
+  }
+  if (pad.shape === "RECT") {
+    return {
+      shape: "rotated_pill_hole_with_rect_pad",
+      hole_shape: "rotated_pill",
+      pad_shape: "rect",
+      hole_width: holeWidthMm,
+      hole_height: holeHeightMm,
+      hole_ccw_rotation: pad.rotation,
+      rect_ccw_rotation: pad.rotation,
+      rect_pad_width: mil2mm(pad.width),
+      rect_pad_height: mil2mm(pad.height)
+    };
+  }
+  if (pad.shape === "OVAL" || holeLengthMm > holeDiameterMm) {
+    return {
+      shape: "pill",
+      hole_width: holeWidthMm,
+      hole_height: holeHeightMm,
+      outer_width: mil2mm(pad.width),
+      outer_height: mil2mm(pad.height),
+      ccw_rotation: pad.rotation
+    };
+  }
+  return {
+    shape: "circle",
+    hole_diameter: holeDiameterMm,
+    outer_diameter: mil2mm(pad.width),
+    radius: mil2mm(pad.holeRadius)
+  };
+};
 var normalizeActiveLowPinLabel = (label) => {
   const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
   if (!hasActiveLowMarker)
@@ -365647,41 +365759,6 @@ var getBoardOutlinePolygons3 = (tracks) => {
   }
   return polygons;
 };
-var unitToMm3 = {
-  in: 25.4,
-  inch: 25.4,
-  mil: 0.0254,
-  mm: 1,
-  m: 1000,
-  cm: 10,
-  ft: 304.8,
-  feet: 304.8
-};
-var mmNumberFormatter = new Intl.NumberFormat("en-US", {
-  useGrouping: false,
-  notation: "standard",
-  maximumFractionDigits: 12
-});
-var mm4 = (n) => {
-  let unit = typeof n === "number" ? "mm" : n.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
-  if (!unit)
-    unit = "mm";
-  const val = typeof n === "number" ? n : Number.parseFloat(n.split(unit)[0]);
-  if (unit in unitToMm3) {
-    return val * unitToMm3[unit];
-  }
-  throw new Error(`Unsupported unit: ${unit}`);
-};
-var mmStr2 = (n) => {
-  return `${mmNumberFormatter.format(mm4(n))}mm`;
-};
-var mil2mm = (mil) => {
-  if (typeof mil === "number")
-    return mm4(`${mil}mil`);
-  if (mil.match(/^\d+$/))
-    return mm4(`${mil}mil`);
-  return mm4(mil);
-};
 var DEFAULT_PCB_THICKNESS_MM = 1.6;
 function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
@@ -366331,68 +366408,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
       };
-      let additionalPlatedHoleProps;
-      if (pad.shape === "OVAL") {
-        const largestOuterDimensionName = mil2mm(pad.width) > mil2mm(pad.height) ? "width" : "height";
-        const smallestOuterDimension = Math.min(mil2mm(pad.width), mil2mm(pad.height));
-        const largestOuterDimension = Math.max(mil2mm(pad.width), mil2mm(pad.height));
-        const distanceFromOuterPlatingToHole = smallestOuterDimension / 2 - mil2mm(pad.holeRadius);
-        const largestInnerDimension = largestOuterDimension - distanceFromOuterPlatingToHole * 2;
-        const smallestInnerDimension = mil2mm(pad.holeRadius) * 2;
-        const innerWidth = largestOuterDimensionName === "width" ? largestInnerDimension : smallestInnerDimension;
-        const innerHeight = largestOuterDimensionName === "height" ? largestInnerDimension : smallestInnerDimension;
-        additionalPlatedHoleProps = {
-          shape: "pill",
-          hole_width: innerWidth,
-          hole_height: innerHeight,
-          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);
-        const padHeight = mil2mm(pad.height);
-        const holeRadius = mil2mm(pad.holeRadius);
-        const holeDiameter = holeRadius * 2;
-        const aspectRatio = Math.max(padWidth, padHeight) / Math.min(padWidth, padHeight);
-        const isSignificantlyRectangular = aspectRatio > 1.5;
-        if (isSignificantlyRectangular) {
-          const baseWidth = holeDiameter;
-          const pillHeight = baseWidth * 2.6;
-          const holeWidth = padWidth > padHeight ? pillHeight : baseWidth;
-          const holeHeight = padHeight > padWidth ? pillHeight : baseWidth;
-          additionalPlatedHoleProps = {
-            shape: "rotated_pill_hole_with_rect_pad",
-            hole_shape: "rotated_pill",
-            pad_shape: "rect",
-            hole_width: holeWidth,
-            hole_height: holeHeight,
-            hole_ccw_rotation: pad.rotation || 0,
-            rect_ccw_rotation: pad.rotation || 0,
-            rect_pad_width: padWidth,
-            rect_pad_height: padHeight
-          };
-        } else {
-          additionalPlatedHoleProps = {
-            shape: "rotated_pill_hole_with_rect_pad",
-            hole_shape: "rotated_pill",
-            pad_shape: "rect",
-            hole_width: holeDiameter,
-            hole_height: holeDiameter,
-            hole_ccw_rotation: pad.rotation || 0,
-            rect_ccw_rotation: pad.rotation || 0,
-            rect_pad_width: padWidth,
-            rect_pad_height: padHeight
-          };
-        }
-      } else {
-        additionalPlatedHoleProps = {
-          shape: "circle",
-          hole_diameter: mil2mm(pad.holeRadius) * 2,
-          outer_diameter: mil2mm(pad.width),
-          radius: mil2mm(pad.holeRadius)
-        };
-      }
+      const additionalPlatedHoleProps = getEasyEdaPlatedHoleGeometry(pad);
       circuitElements.push(pcb_plated_hole.parse({
         ...commonPlatedHoleProps,
         ...additionalPlatedHoleProps
@@ -366745,6 +366761,8 @@ var PadSchema = BaseShapeSchema.extend({
   net: external_exports2.union([external_exports2.string(), external_exports2.number()]).optional(),
   number: external_exports2.union([external_exports2.string(), external_exports2.number()]),
   holeRadius: tenthmil,
+  holeLength: tenthmil.optional(),
+  holePoints: external_exports2.array(PointSchema).length(2).optional(),
   points: external_exports2.array(PointSchema).optional(),
   rotation: safeNumber(0),
   plated: external_exports2.boolean()
@@ -366877,6 +366895,8 @@ var ShapeItemSchema = external_exports2.object({
         net,
         number: padNumber,
         holeRadius,
+        holeLength: rest[3] === undefined || rest[3] === "" ? undefined : rest[3],
+        holePoints: rest[4] ? parsePoints(String(rest[4])) : undefined,
         points,
         rotation: rotation2,
         plated: rest.includes("Y")
@@ -368628,8 +368648,9 @@ var getGeneratedComponentType = (betterEasy, pinCount) => {
     return "pushbutton";
   if (isDipSwitchCategoryComponent(betterEasy))
     return "chip";
-  if (isSwitchCategoryComponent(betterEasy))
-    return "switch";
+  if (isSwitchCategoryComponent(betterEasy)) {
+    return pinCount > 2 ? "chip" : "switch";
+  }
   if (isCapacitorComponent(betterEasy))
     return "capacitor";
   if (isResistorComponent(betterEasy) && pinCount === 2)
@@ -368721,7 +368742,7 @@ var convertBetterEasyToTsx = async ({
     jlcpcb: [betterEasy.lcsc.number]
   };
   const componentType = getGeneratedComponentType(betterEasy, sourcePorts.length);
-  const isDipSwitch = isDipSwitchCategoryComponent(betterEasy);
+  const isSwitchRenderedAsChip = isDipSwitchCategoryComponent(betterEasy) || isSwitchCategoryComponent(betterEasy) && sourcePorts.length > 2;
   const inductance2 = componentType === "inductor" ? betterEasy.dataStr.head.c_para.Value?.trim() : undefined;
   const capacitance2 = componentType === "capacitor" ? normalizeCapacitanceValue(betterEasy.dataStr.head.c_para.Value) : undefined;
   const resistance2 = componentType === "resistor" ? normalizeResistorValue(betterEasy.dataStr.head.c_para.Value) : undefined;
@@ -368730,7 +368751,7 @@ var convertBetterEasyToTsx = async ({
   const isMultiPinDiode = isDiodeCategoryComponent(betterEasy) && sourcePorts.length !== 2;
   const isMultiPinInductor = isInductorComponent(betterEasy) && sourcePorts.length !== 2;
   const isPassiveWithCustomSymbol = componentType === "capacitor" && sourcePorts.length !== 2;
-  const symbolTsx = isPassiveWithCustomSymbol || componentType === "chip" && !isMultiPinDiode && !isMultiPinInductor && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson, {
+  const symbolTsx = isPassiveWithCustomSymbol || componentType === "chip" && !isMultiPinDiode && !isMultiPinInductor && !isSwitchRenderedAsChip && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson, {
     alignPortsToDrawing: isPassiveWithCustomSymbol
   }) : undefined;
   const schPinArrangement = symbolTsx ? undefined : getVisibleSchematicPinArrangement(betterEasy);
@@ -368750,8 +368771,7 @@ var convertBetterEasyToTsx = async ({
     crystalFrequency,
     crystalPinVariant,
     symbolTsx,
-    schPinArrangement,
-    useSymbolPortsOnly: isDipSwitch && Boolean(symbolTsx)
+    schPinArrangement
   });
 };
 var checkModelObjUrlValidity = async (url) => {
@@ -369152,6 +369172,360 @@ var __export6 = (target, all) => {
   for (var name in all)
     __defProp7(target, name, { get: all[name], enumerable: true });
 };
+var unitToMm4 = {
+  in: 25.4,
+  inch: 25.4,
+  mil: 0.0254,
+  mm: 1,
+  m: 1000,
+  cm: 10,
+  ft: 304.8,
+  feet: 304.8
+};
+var mmNumberFormatter2 = new Intl.NumberFormat("en-US", {
+  useGrouping: false,
+  notation: "standard",
+  maximumFractionDigits: 12
+});
+var mm5 = (n) => {
+  let unit = typeof n === "number" ? "mm" : n.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
+  if (!unit)
+    unit = "mm";
+  const val = typeof n === "number" ? n : Number.parseFloat(n.split(unit)[0]);
+  if (unit in unitToMm4) {
+    return val * unitToMm4[unit];
+  }
+  throw new Error(`Unsupported unit: ${unit}`);
+};
+var mil2mm2 = (mil) => {
+  if (typeof mil === "number")
+    return mm5(`${mil}mil`);
+  if (mil.match(/^\d+$/))
+    return mm5(`${mil}mil`);
+  return mm5(mil);
+};
+function applyToPoint107(matrix, point2) {
+  return Array.isArray(point2) ? [
+    matrix.a * point2[0] + matrix.c * point2[1] + matrix.e,
+    matrix.b * point2[0] + matrix.d * point2[1] + matrix.f
+  ] : {
+    x: matrix.a * point2.x + matrix.c * point2.y + matrix.e,
+    y: matrix.b * point2.x + matrix.d * point2.y + matrix.f
+  };
+}
+function isUndefined4(val) {
+  return typeof val === "undefined";
+}
+function translate27(tx, ty = 0) {
+  return {
+    a: 1,
+    c: 0,
+    e: tx,
+    b: 0,
+    d: 1,
+    f: ty
+  };
+}
+function transform3(...matrices) {
+  matrices = Array.isArray(matrices[0]) ? matrices[0] : matrices;
+  const multiply = (m1, m2) => {
+    return {
+      a: m1.a * m2.a + m1.c * m2.b,
+      c: m1.a * m2.c + m1.c * m2.d,
+      e: m1.a * m2.e + m1.c * m2.f + m1.e,
+      b: m1.b * m2.a + m1.d * m2.b,
+      d: m1.b * m2.c + m1.d * m2.d,
+      f: m1.b * m2.e + m1.d * m2.f + m1.f
+    };
+  };
+  switch (matrices.length) {
+    case 0:
+      throw new Error("no matrices provided");
+    case 1:
+      return matrices[0];
+    case 2:
+      return multiply(matrices[0], matrices[1]);
+    default: {
+      const [m1, m2, ...rest] = matrices;
+      const m3 = multiply(m1, m2);
+      return transform3(m3, ...rest);
+    }
+  }
+}
+function compose28(...matrices) {
+  return transform3(...matrices);
+}
+var { cos: cos4, sin: sin4, PI: PI4 } = Math;
+function rotate21(angle, cx, cy) {
+  const cosAngle = cos4(angle);
+  const sinAngle = sin4(angle);
+  const rotationMatrix = {
+    a: cosAngle,
+    c: -sinAngle,
+    e: 0,
+    b: sinAngle,
+    d: cosAngle,
+    f: 0
+  };
+  if (isUndefined4(cx) || isUndefined4(cy)) {
+    return rotationMatrix;
+  }
+  return transform3([
+    translate27(cx, cy),
+    rotationMatrix,
+    translate27(-cx, -cy)
+  ]);
+}
+function rotateDEG3(angle, cx = undefined, cy = undefined) {
+  return rotate21(angle * PI4 / 180, cx, cy);
+}
+function scale15(sx, sy = undefined, cx = undefined, cy = undefined) {
+  if (isUndefined4(sy))
+    sy = sx;
+  const scaleMatrix = {
+    a: sx,
+    c: 0,
+    e: 0,
+    b: 0,
+    d: sy,
+    f: 0
+  };
+  if (isUndefined4(cx) || isUndefined4(cy)) {
+    return scaleMatrix;
+  }
+  return transform3([
+    translate27(cx, cy),
+    scaleMatrix,
+    translate27(-cx, -cy)
+  ]);
+}
+var { tan: tan4 } = Math;
+function peg$subclass3(child, parent) {
+  function C() {
+    this.constructor = child;
+  }
+  C.prototype = parent.prototype;
+  child.prototype = new C;
+}
+function peg$SyntaxError3(message, expected, found, location) {
+  var self2 = Error.call(this, message);
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self2, peg$SyntaxError3.prototype);
+  }
+  self2.expected = expected;
+  self2.found = found;
+  self2.location = location;
+  self2.name = "SyntaxError";
+  return self2;
+}
+peg$subclass3(peg$SyntaxError3, Error);
+function peg$padEnd3(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) {
+    return str;
+  }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
+peg$SyntaxError3.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0;k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = this.location.source && typeof this.location.source.offset === "function" ? this.location.source.offset(s) : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd3("", offset_s.line.toString().length, " ");
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = last - s.column || 1;
+      str += `
+ --> ` + loc + `
+` + filler + ` |
+` + offset_s.line + " | " + line + `
+` + filler + " | " + peg$padEnd3("", s.column - 1, " ") + peg$padEnd3("", hatLen, "^");
+    } else {
+      str += `
+ at ` + loc;
+    }
+  }
+  return str;
+};
+peg$SyntaxError3.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return '"' + literalEscape(expectation.text) + '"';
+    },
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part) ? classEscape(part[0]) + "-" + classEscape(part[1]) : classEscape(part);
+      });
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
+    any: function() {
+      return "any character";
+    },
+    end: function() {
+      return "end of input";
+    },
+    other: function(expectation) {
+      return expectation.description;
+    }
+  };
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
+  function literalEscape(s) {
+    return s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"").replace(/\0/g, "\\0").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/[\x00-\x0F]/g, function(ch) {
+      return "\\x0" + hex(ch);
+    }).replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
+      return "\\x" + hex(ch);
+    });
+  }
+  function classEscape(s) {
+    return s.replace(/\\/g, "\\\\").replace(/\]/g, "\\]").replace(/\^/g, "\\^").replace(/-/g, "\\-").replace(/\0/g, "\\0").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/[\x00-\x0F]/g, function(ch) {
+      return "\\x0" + hex(ch);
+    }).replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
+      return "\\x" + hex(ch);
+    });
+  }
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+  function describeExpected(expected2) {
+    var descriptions = expected2.map(describeExpectation);
+    var i, j;
+    descriptions.sort();
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1;i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
+      }
+      descriptions.length = j;
+    }
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+      default:
+        return descriptions.slice(0, -1).join(", ") + ", or " + descriptions[descriptions.length - 1];
+    }
+  }
+  function describeFound(found2) {
+    return found2 ? '"' + literalEscape(found2) + '"' : "end of input";
+  }
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
+function decomposeTSR3(matrix, flipX = false, flipY = false) {
+  if (flipX) {
+    if (flipY) {
+      matrix = compose28(matrix, scale15(-1, -1));
+    } else {
+      matrix = compose28(matrix, scale15(1, -1));
+    }
+  } else if (flipY) {
+    matrix = compose28(matrix, scale15(-1, 1));
+  }
+  const a = matrix.a;
+  const b = matrix.b;
+  const c = matrix.c;
+  const d = matrix.d;
+  let scaleX, scaleY, rotation2;
+  if (a !== 0 || c !== 0) {
+    const hypotAc = Math.hypot(a, c);
+    scaleX = hypotAc;
+    scaleY = (a * d - b * c) / hypotAc;
+    const acos = Math.acos(a / hypotAc);
+    rotation2 = c > 0 ? -acos : acos;
+  } else if (b !== 0 || d !== 0) {
+    const hypotBd = Math.hypot(b, d);
+    scaleX = (a * d - b * c) / hypotBd;
+    scaleY = hypotBd;
+    const acos = Math.acos(b / hypotBd);
+    rotation2 = Math.PI / 2 + (d > 0 ? -acos : acos);
+  } else {
+    scaleX = 0;
+    scaleY = 0;
+    rotation2 = 0;
+  }
+  if (flipY) {
+    scaleX = -scaleX;
+  }
+  if (flipX) {
+    scaleY = -scaleY;
+  }
+  return {
+    translate: { tx: matrix.e, ty: matrix.f },
+    scale: { sx: scaleX, sy: scaleY },
+    rotation: { angle: rotation2 }
+  };
+}
+var getEasyEdaPlatedHoleGeometry2 = (pad) => {
+  const holeDiameterMm = mil2mm2(pad.holeRadius) * 2;
+  const holeLengthMm = pad.holeLength ? mil2mm2(pad.holeLength) : 0;
+  let holeWidthMm = holeDiameterMm;
+  let holeHeightMm = holeDiameterMm;
+  if (holeLengthMm > holeDiameterMm) {
+    if (!pad.holePoints) {
+      throw new Error(`Slot on pad ${pad.number} is missing hole endpoints`);
+    }
+    const [start, end] = pad.holePoints;
+    const localHoleDirection = applyToPoint107(rotateDEG3(pad.rotation), {
+      x: end.x - start.x,
+      y: end.y - start.y
+    });
+    const absX = Math.abs(localHoleDirection.x);
+    const absY = Math.abs(localHoleDirection.y);
+    if (Math.min(absX, absY) > Math.max(absX, absY) * 0.001) {
+      throw new Error(`Slot on pad ${pad.number} is not aligned with its pad`);
+    }
+    if (absX > absY)
+      holeWidthMm = holeLengthMm;
+    else
+      holeHeightMm = holeLengthMm;
+  }
+  if (pad.shape === "RECT") {
+    return {
+      shape: "rotated_pill_hole_with_rect_pad",
+      hole_shape: "rotated_pill",
+      pad_shape: "rect",
+      hole_width: holeWidthMm,
+      hole_height: holeHeightMm,
+      hole_ccw_rotation: pad.rotation,
+      rect_ccw_rotation: pad.rotation,
+      rect_pad_width: mil2mm2(pad.width),
+      rect_pad_height: mil2mm2(pad.height)
+    };
+  }
+  if (pad.shape === "OVAL" || holeLengthMm > holeDiameterMm) {
+    return {
+      shape: "pill",
+      hole_width: holeWidthMm,
+      hole_height: holeHeightMm,
+      outer_width: mil2mm2(pad.width),
+      outer_height: mil2mm2(pad.height),
+      ccw_rotation: pad.rotation
+    };
+  }
+  return {
+    shape: "circle",
+    hole_diameter: holeDiameterMm,
+    outer_diameter: mil2mm2(pad.width),
+    radius: mil2mm2(pad.holeRadius)
+  };
+};
 var normalizeActiveLowPinLabel2 = (label) => {
   const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
   if (!hasActiveLowMarker)
@@ -373576,251 +373950,6 @@ var any_circuit_element2 = z198.union([
 var any_soup_element5 = any_circuit_element2;
 expectTypesMatch3(true);
 expectStringUnionsMatch2(true);
-function applyToPoint107(matrix, point2) {
-  return Array.isArray(point2) ? [
-    matrix.a * point2[0] + matrix.c * point2[1] + matrix.e,
-    matrix.b * point2[0] + matrix.d * point2[1] + matrix.f
-  ] : {
-    x: matrix.a * point2.x + matrix.c * point2.y + matrix.e,
-    y: matrix.b * point2.x + matrix.d * point2.y + matrix.f
-  };
-}
-function isUndefined4(val) {
-  return typeof val === "undefined";
-}
-function translate27(tx, ty = 0) {
-  return {
-    a: 1,
-    c: 0,
-    e: tx,
-    b: 0,
-    d: 1,
-    f: ty
-  };
-}
-function transform3(...matrices) {
-  matrices = Array.isArray(matrices[0]) ? matrices[0] : matrices;
-  const multiply = (m1, m2) => {
-    return {
-      a: m1.a * m2.a + m1.c * m2.b,
-      c: m1.a * m2.c + m1.c * m2.d,
-      e: m1.a * m2.e + m1.c * m2.f + m1.e,
-      b: m1.b * m2.a + m1.d * m2.b,
-      d: m1.b * m2.c + m1.d * m2.d,
-      f: m1.b * m2.e + m1.d * m2.f + m1.f
-    };
-  };
-  switch (matrices.length) {
-    case 0:
-      throw new Error("no matrices provided");
-    case 1:
-      return matrices[0];
-    case 2:
-      return multiply(matrices[0], matrices[1]);
-    default: {
-      const [m1, m2, ...rest] = matrices;
-      const m3 = multiply(m1, m2);
-      return transform3(m3, ...rest);
-    }
-  }
-}
-function compose28(...matrices) {
-  return transform3(...matrices);
-}
-var { cos: cos4, sin: sin4, PI: PI4 } = Math;
-function scale15(sx, sy = undefined, cx = undefined, cy = undefined) {
-  if (isUndefined4(sy))
-    sy = sx;
-  const scaleMatrix = {
-    a: sx,
-    c: 0,
-    e: 0,
-    b: 0,
-    d: sy,
-    f: 0
-  };
-  if (isUndefined4(cx) || isUndefined4(cy)) {
-    return scaleMatrix;
-  }
-  return transform3([
-    translate27(cx, cy),
-    scaleMatrix,
-    translate27(-cx, -cy)
-  ]);
-}
-var { tan: tan4 } = Math;
-function peg$subclass3(child, parent) {
-  function C() {
-    this.constructor = child;
-  }
-  C.prototype = parent.prototype;
-  child.prototype = new C;
-}
-function peg$SyntaxError3(message, expected, found, location) {
-  var self2 = Error.call(this, message);
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self2, peg$SyntaxError3.prototype);
-  }
-  self2.expected = expected;
-  self2.found = found;
-  self2.location = location;
-  self2.name = "SyntaxError";
-  return self2;
-}
-peg$subclass3(peg$SyntaxError3, Error);
-function peg$padEnd3(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) {
-    return str;
-  }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
-peg$SyntaxError3.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0;k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
-      }
-    }
-    var s = this.location.start;
-    var offset_s = this.location.source && typeof this.location.source.offset === "function" ? this.location.source.offset(s) : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd3("", offset_s.line.toString().length, " ");
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = last - s.column || 1;
-      str += `
- --> ` + loc + `
-` + filler + ` |
-` + offset_s.line + " | " + line + `
-` + filler + " | " + peg$padEnd3("", s.column - 1, " ") + peg$padEnd3("", hatLen, "^");
-    } else {
-      str += `
- at ` + loc;
-    }
-  }
-  return str;
-};
-peg$SyntaxError3.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return '"' + literalEscape(expectation.text) + '"';
-    },
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part) ? classEscape(part[0]) + "-" + classEscape(part[1]) : classEscape(part);
-      });
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
-    any: function() {
-      return "any character";
-    },
-    end: function() {
-      return "end of input";
-    },
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
-  function literalEscape(s) {
-    return s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"").replace(/\0/g, "\\0").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/[\x00-\x0F]/g, function(ch) {
-      return "\\x0" + hex(ch);
-    }).replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
-      return "\\x" + hex(ch);
-    });
-  }
-  function classEscape(s) {
-    return s.replace(/\\/g, "\\\\").replace(/\]/g, "\\]").replace(/\^/g, "\\^").replace(/-/g, "\\-").replace(/\0/g, "\\0").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/[\x00-\x0F]/g, function(ch) {
-      return "\\x0" + hex(ch);
-    }).replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) {
-      return "\\x" + hex(ch);
-    });
-  }
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
-  function describeExpected(expected2) {
-    var descriptions = expected2.map(describeExpectation);
-    var i, j;
-    descriptions.sort();
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1;i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
-      }
-      descriptions.length = j;
-    }
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
-      default:
-        return descriptions.slice(0, -1).join(", ") + ", or " + descriptions[descriptions.length - 1];
-    }
-  }
-  function describeFound(found2) {
-    return found2 ? '"' + literalEscape(found2) + '"' : "end of input";
-  }
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
-function decomposeTSR3(matrix, flipX = false, flipY = false) {
-  if (flipX) {
-    if (flipY) {
-      matrix = compose28(matrix, scale15(-1, -1));
-    } else {
-      matrix = compose28(matrix, scale15(1, -1));
-    }
-  } else if (flipY) {
-    matrix = compose28(matrix, scale15(-1, 1));
-  }
-  const a = matrix.a;
-  const b = matrix.b;
-  const c = matrix.c;
-  const d = matrix.d;
-  let scaleX, scaleY, rotation2;
-  if (a !== 0 || c !== 0) {
-    const hypotAc = Math.hypot(a, c);
-    scaleX = hypotAc;
-    scaleY = (a * d - b * c) / hypotAc;
-    const acos = Math.acos(a / hypotAc);
-    rotation2 = c > 0 ? -acos : acos;
-  } else if (b !== 0 || d !== 0) {
-    const hypotBd = Math.hypot(b, d);
-    scaleX = (a * d - b * c) / hypotBd;
-    scaleY = hypotBd;
-    const acos = Math.acos(b / hypotBd);
-    rotation2 = Math.PI / 2 + (d > 0 ? -acos : acos);
-  } else {
-    scaleX = 0;
-    scaleY = 0;
-    rotation2 = 0;
-  }
-  if (flipY) {
-    scaleX = -scaleX;
-  }
-  if (flipX) {
-    scaleY = -scaleY;
-  }
-  return {
-    translate: { tx: matrix.e, ty: matrix.f },
-    scale: { sx: scaleX, sy: scaleY },
-    rotation: { angle: rotation2 }
-  };
-}
 function connect3(map, a, b) {
   if (!a || !b)
     return;
@@ -375113,38 +375242,6 @@ var PIN1_LOCATION_PARTS2 = {
   bottomside_right: { side: "bottomside", alignment: "right" }
 };
 var PIN1_LOCATIONS3 = Object.keys(PIN1_LOCATION_PARTS2);
-var unitToMm4 = {
-  in: 25.4,
-  inch: 25.4,
-  mil: 0.0254,
-  mm: 1,
-  m: 1000,
-  cm: 10,
-  ft: 304.8,
-  feet: 304.8
-};
-var mmNumberFormatter2 = new Intl.NumberFormat("en-US", {
-  useGrouping: false,
-  notation: "standard",
-  maximumFractionDigits: 12
-});
-var mm5 = (n) => {
-  let unit = typeof n === "number" ? "mm" : n.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
-  if (!unit)
-    unit = "mm";
-  const val = typeof n === "number" ? n : Number.parseFloat(n.split(unit)[0]);
-  if (unit in unitToMm4) {
-    return val * unitToMm4[unit];
-  }
-  throw new Error(`Unsupported unit: ${unit}`);
-};
-var mil2mm2 = (mil) => {
-  if (typeof mil === "number")
-    return mm5(`${mil}mil`);
-  if (mil.match(/^\d+$/))
-    return mm5(`${mil}mil`);
-  return mm5(mil);
-};
 var DEFAULT_PCB_THICKNESS_MM2 = 1.6;
 function generateArcFromSweep2(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
@@ -375780,68 +375877,7 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
       };
-      let additionalPlatedHoleProps;
-      if (pad.shape === "OVAL") {
-        const largestOuterDimensionName = mil2mm2(pad.width) > mil2mm2(pad.height) ? "width" : "height";
-        const smallestOuterDimension = Math.min(mil2mm2(pad.width), mil2mm2(pad.height));
-        const largestOuterDimension = Math.max(mil2mm2(pad.width), mil2mm2(pad.height));
-        const distanceFromOuterPlatingToHole = smallestOuterDimension / 2 - mil2mm2(pad.holeRadius);
-        const largestInnerDimension = largestOuterDimension - distanceFromOuterPlatingToHole * 2;
-        const smallestInnerDimension = mil2mm2(pad.holeRadius) * 2;
-        const innerWidth = largestOuterDimensionName === "width" ? largestInnerDimension : smallestInnerDimension;
-        const innerHeight = largestOuterDimensionName === "height" ? largestInnerDimension : smallestInnerDimension;
-        additionalPlatedHoleProps = {
-          shape: "pill",
-          hole_width: innerWidth,
-          hole_height: innerHeight,
-          outer_width: mil2mm2(pad.width),
-          outer_height: mil2mm2(pad.height),
-          ccw_rotation: pad.rotation || 0
-        };
-      } else if (pad.shape === "RECT") {
-        const padWidth = mil2mm2(pad.width);
-        const padHeight = mil2mm2(pad.height);
-        const holeRadius = mil2mm2(pad.holeRadius);
-        const holeDiameter = holeRadius * 2;
-        const aspectRatio = Math.max(padWidth, padHeight) / Math.min(padWidth, padHeight);
-        const isSignificantlyRectangular = aspectRatio > 1.5;
-        if (isSignificantlyRectangular) {
-          const baseWidth = holeDiameter;
-          const pillHeight = baseWidth * 2.6;
-          const holeWidth = padWidth > padHeight ? pillHeight : baseWidth;
-          const holeHeight = padHeight > padWidth ? pillHeight : baseWidth;
-          additionalPlatedHoleProps = {
-            shape: "rotated_pill_hole_with_rect_pad",
-            hole_shape: "rotated_pill",
-            pad_shape: "rect",
-            hole_width: holeWidth,
-            hole_height: holeHeight,
-            hole_ccw_rotation: pad.rotation || 0,
-            rect_ccw_rotation: pad.rotation || 0,
-            rect_pad_width: padWidth,
-            rect_pad_height: padHeight
-          };
-        } else {
-          additionalPlatedHoleProps = {
-            shape: "rotated_pill_hole_with_rect_pad",
-            hole_shape: "rotated_pill",
-            pad_shape: "rect",
-            hole_width: holeDiameter,
-            hole_height: holeDiameter,
-            hole_ccw_rotation: pad.rotation || 0,
-            rect_ccw_rotation: pad.rotation || 0,
-            rect_pad_width: padWidth,
-            rect_pad_height: padHeight
-          };
-        }
-      } else {
-        additionalPlatedHoleProps = {
-          shape: "circle",
-          hole_diameter: mil2mm2(pad.holeRadius) * 2,
-          outer_diameter: mil2mm2(pad.width),
-          radius: mil2mm2(pad.holeRadius)
-        };
-      }
+      const additionalPlatedHoleProps = getEasyEdaPlatedHoleGeometry2(pad);
       circuitElements.push(pcb_plated_hole2.parse({
         ...commonPlatedHoleProps,
         ...additionalPlatedHoleProps
@@ -376216,6 +376252,8 @@ var PadSchema2 = BaseShapeSchema2.extend({
   net: z200.union([z200.string(), z200.number()]).optional(),
   number: z200.union([z200.string(), z200.number()]),
   holeRadius: tenthmil2,
+  holeLength: tenthmil2.optional(),
+  holePoints: z200.array(PointSchema3).length(2).optional(),
   points: z200.array(PointSchema3).optional(),
   rotation: safeNumber2(0),
   plated: z200.boolean()
@@ -376348,6 +376386,8 @@ var ShapeItemSchema2 = z200.object({
         net,
         number: padNumber,
         holeRadius,
+        holeLength: rest[3] === undefined || rest[3] === "" ? undefined : rest[3],
+        holePoints: rest[4] ? parsePoints3(String(rest[4])) : undefined,
         points,
         rotation: rotation2,
         plated: rest.includes("Y")

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2230";
+var version = "0.1.2231";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69178,7 +69178,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.366",
+    easyeda: "^0.0.368",
     "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.2231",
+  "version": "0.1.2232",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -66,7 +66,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "^0.0.90",
-    "easyeda": "^0.0.366",
+    "easyeda": "^0.0.368",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",