@tscircuit/cli 0.1.1880 → 0.1.1882

package/dist/cli/main.js

@@ -77175,6 +77175,13 @@ import {
 import { applyToPoint as applyToPoint29, identity as identity10 } from "transformation-matrix";
 import { convertCircuitJsonToPcbSvg as convertCircuitJsonToPcbSvg22 } from "circuit-to-svg";
 import { deflateSync } from "node:zlib";
+import {
+  glyphAdvanceRatio as glyphAdvanceRatio2,
+  glyphWidthRatio,
+  spaceWidthRatio,
+  strokeWidthRatio,
+  svgAlphabet as svgAlphabet2
+} from "@tscircuit/alphabet";
 
 class BitmapCanvasContext {
   canvas;
@@ -77588,57 +77595,6 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
       }
     }
   }
-}, drawDebugFilledCircle = ({
-  rgba,
-  width,
-  height,
-  center: center2,
-  radius,
-  color,
-  alpha
-}) => {
-  const minX = Math.max(0, Math.floor(center2.x - radius));
-  const maxX = Math.min(width - 1, Math.ceil(center2.x + radius));
-  const minY = Math.max(0, Math.floor(center2.y - radius));
-  const maxY = Math.min(height - 1, Math.ceil(center2.y + radius));
-  for (let y4 = minY;y4 <= maxY; y4++) {
-    for (let x4 = minX;x4 <= maxX; x4++) {
-      const distance49 = Math.hypot(x4 + 0.5 - center2.x, y4 + 0.5 - center2.y);
-      if (distance49 <= radius) {
-        blendRgbaPixel(rgba, y4 * width + x4, color, alpha);
-      }
-    }
-  }
-}, drawDebugLine = ({
-  rgba,
-  width,
-  height,
-  start,
-  end,
-  color,
-  alpha,
-  strokeWidth = 1.5
-}) => {
-  const strokeRadius = strokeWidth / 2;
-  const minX = Math.max(0, Math.floor(Math.min(start.x, end.x) - strokeRadius));
-  const maxX = Math.min(width - 1, Math.ceil(Math.max(start.x, end.x) + strokeRadius));
-  const minY = Math.max(0, Math.floor(Math.min(start.y, end.y) - strokeRadius));
-  const maxY = Math.min(height - 1, Math.ceil(Math.max(start.y, end.y) + strokeRadius));
-  const lineLength = Math.hypot(end.x - start.x, end.y - start.y);
-  if (lineLength === 0)
-    return;
-  for (let y4 = minY;y4 <= maxY; y4++) {
-    for (let x4 = minX;x4 <= maxX; x4++) {
-      const px3 = x4 + 0.5;
-      const py3 = y4 + 0.5;
-      const t50 = Math.max(0, Math.min(1, ((px3 - start.x) * (end.x - start.x) + (py3 - start.y) * (end.y - start.y)) / lineLength ** 2));
-      const nearestX = start.x + (end.x - start.x) * t50;
-      const nearestY = start.y + (end.y - start.y) * t50;
-      if (Math.hypot(px3 - nearestX, py3 - nearestY) <= strokeRadius) {
-        blendRgbaPixel(rgba, y4 * width + x4, color, alpha);
-      }
-    }
-  }
 }, overlayPcbPortMarkers = ({
   circuitJson,
   bounds,
@@ -77673,7 +77629,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   height,
   rgba
 }) => {
-  const markerColor = [155, 92, 255];
+  const markerColor = [255, 0, 255];
   for (const short of shorts) {
     const point9 = getPixelPointFromReal({
       x: short.center.x,
@@ -77687,43 +77643,43 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
       width,
       height,
       center: point9,
-      radius: 12,
+      radius: 14,
       color: markerColor,
-      alpha: 0.65,
-      strokeWidth: 3
+      alpha: 1,
+      strokeWidth: 4
     });
-    drawDebugFilledCircle({
+    drawDebugCircleOutline({
       rgba,
       width,
       height,
       center: point9,
-      radius: 4,
-      color: markerColor,
-      alpha: 0.4
-    });
-    drawDebugLine({
-      rgba,
-      width,
-      height,
-      start: { x: point9.x - 16, y: point9.y },
-      end: { x: point9.x + 16, y: point9.y },
-      color: markerColor,
-      alpha: 0.65,
-      strokeWidth: 3
-    });
-    drawDebugLine({
-      rgba,
-      width,
-      height,
-      start: { x: point9.x, y: point9.y - 16 },
-      end: { x: point9.x, y: point9.y + 16 },
+      radius: 6,
       color: markerColor,
-      alpha: 0.65,
+      alpha: 1,
       strokeWidth: 3
     });
   }
-}, getGerberLayerName2 = (layer) => layer === "top" ? "F_Cu" : "B_Cu", getGerberLayerString = (elements, layer) => {
-  const gerberLayers = stringifyGerberCommandLayers(convertSoupToGerberCommands(elements));
+}, getGerberLayerName2 = (layer) => {
+  if (layer === "top")
+    return "F_Cu";
+  if (layer === "bottom")
+    return "B_Cu";
+  return `In${layer.slice("inner".length)}_Cu`;
+}, normalizeRotation = (rotation11) => (rotation11 % 360 + 360) % 360, isOddQuarterTurn = (rotation11) => Math.abs(rotation11 - 90) < 0.000001 || Math.abs(rotation11 - 270) < 0.000001, normalizeOrthogonalSmtpadRotations = (elements) => elements.map((element) => {
+  if (element.type !== "pcb_smtpad" || element.shape !== "rotated_rect") {
+    return element;
+  }
+  const rotation11 = normalizeRotation(element.ccw_rotation);
+  if (!isOddQuarterTurn(rotation11))
+    return element;
+  return {
+    ...element,
+    width: element.height,
+    height: element.width,
+    ccw_rotation: 0
+  };
+}), getGerberLayerString = (elements, layer) => {
+  const gerberLayers = stringifyGerberCommandLayers(convertSoupToGerberCommands(normalizeOrthogonalSmtpadRotations(elements)));
   return gerberLayers[getGerberLayerName2(layer)];
 }, assertGerberLayerCanBeGenerated = (circuitJson, layer) => {
   const gerberLayers = convertSoupToGerberCommands(circuitJson);
@@ -77862,7 +77818,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
 }) => {
   const ctx = new BitmapCanvasContext(width, height);
   const drawer = new CircuitToCanvasDrawer(ctx);
-  const renderLayer = layer === "top" ? "top_copper" : "bottom_copper";
+  const renderLayer = `${layer}_copper`;
   const layerElements = getPcbLayerElements(elements, layer);
   drawer.setCameraBounds(bounds);
   drawer.drawElements(layerElements, {
@@ -77948,6 +77904,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   return clampBounds(expandBounds2(bounds ?? boardBounds, 0.2), boardBounds);
 }, createGroupMask = async ({
   elements,
+  pcbBoard,
   bounds,
   width,
   height,
@@ -77955,7 +77912,13 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   mode
 }) => {
   if (mode === "gerber") {
-    return createGerberGroupMask({ elements, bounds, width, height, layer });
+    return createGerberGroupMask({
+      elements: pcbBoard ? [pcbBoard, ...elements] : elements,
+      bounds,
+      width,
+      height,
+      layer
+    });
   }
   return createPcbGroupMask({ elements, bounds, width, height, layer });
 }, getBitmapDimensions = (bounds, options) => {
@@ -78025,6 +77988,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   };
 }, createBitmapMask = async ({
   elements,
+  pcbBoard,
   boardBounds,
   width,
   height,
@@ -78048,6 +78012,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   });
   const mask = await createGroupMask({
     elements,
+    pcbBoard,
     bounds: maskBounds,
     width: rect.width,
     height: rect.height,
@@ -78140,6 +78105,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   const bounds = getBoardBounds2(circuitJson);
   const { width, height } = getBitmapDimensions(bounds, options);
   const db2 = cju22(circuitJson);
+  const pcbBoard = circuitJson.find((element) => element.type === "pcb_board");
   const connectivityGroups = buildConnectivityGroups({
     circuitJson,
     connMap,
@@ -78162,6 +78128,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     const color = getDebugColorForConnectivityKey(key);
     const bitmapMask = await createBitmapMask({
       elements,
+      pcbBoard,
       boardBounds: bounds,
       width,
       height,
@@ -78229,6 +78196,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     }
     const copperPourMask = await createBitmapMask({
       elements: copperPourElements,
+      pcbBoard,
       boardBounds: bounds,
       width,
       height,
@@ -78247,6 +78215,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     }
     const nonPourMask = await createBitmapMask({
       elements: nonPourElements,
+      pcbBoard,
       boardBounds: bounds,
       width,
       height,
@@ -78331,10 +78300,8 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     return `
   <g data-type="short-debug" data-mode="${escapeXml(short.mode)}" data-layer="${escapeXml(short.layer)}">
     <title>${escapeXml(text)}</title>
-    <circle cx="${point9.x.toFixed(2)}" cy="${point9.y.toFixed(2)}" r="12" fill="none" stroke="${shortMarkerStroke}" stroke-width="3" stroke-opacity="0.65"/>
-    <circle cx="${point9.x.toFixed(2)}" cy="${point9.y.toFixed(2)}" r="4" fill="${shortMarkerStroke}" fill-opacity="0.4"/>
-    <line x1="${(point9.x - 16).toFixed(2)}" y1="${point9.y.toFixed(2)}" x2="${(point9.x + 16).toFixed(2)}" y2="${point9.y.toFixed(2)}" stroke="${shortMarkerStroke}" stroke-width="3" stroke-opacity="0.65"/>
-    <line x1="${point9.x.toFixed(2)}" y1="${(point9.y - 16).toFixed(2)}" x2="${point9.x.toFixed(2)}" y2="${(point9.y + 16).toFixed(2)}" stroke="${shortMarkerStroke}" stroke-width="3" stroke-opacity="0.65"/>
+    <circle cx="${point9.x.toFixed(2)}" cy="${point9.y.toFixed(2)}" r="14" fill="none" stroke="${shortMarkerStroke}" stroke-width="4"/>
+    <circle cx="${point9.x.toFixed(2)}" cy="${point9.y.toFixed(2)}" r="6" fill="none" stroke="${shortMarkerStroke}" stroke-width="3"/>
   </g>`;
   }).join("");
   return baseSvg.replace("</svg>", `${overlays}
@@ -78391,109 +78358,75 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     createChunk("IDAT", deflateSync(scanlines, { level: 1 })),
     createChunk("IEND", new Uint8Array)
   ]);
-}, glyphs, setPixel = (rgba, width, x4, y4, color) => {
-  const offset = (y4 * width + x4) * 4;
-  rgba[offset] = color[0];
-  rgba[offset + 1] = color[1];
-  rgba[offset + 2] = color[2];
-  rgba[offset + 3] = 255;
-}, fillRect = ({
-  rgba,
-  width,
+}, getLegendLabel = (entry) => {
+  const labels = entry.labels.length > 0 ? entry.labels.join(",") : entry.connectivityKey;
+  return labels.length > 36 ? `${labels.slice(0, 33)}...` : labels;
+}, markerLegend, createAlphabetTextSvg = ({
+  text,
   x: x4,
-  y: y4,
-  rectWidth,
-  rectHeight,
-  color
+  top,
+  size,
+  maxWidth
 }) => {
-  for (let yy3 = y4;yy3 < y4 + rectHeight; yy3++) {
-    for (let xx3 = x4;xx3 < x4 + rectWidth; xx3++) {
-      setPixel(rgba, width, xx3, yy3, color);
+  let cursorX = 0;
+  const paths = [];
+  for (const character of text) {
+    const path49 = svgAlphabet2[character];
+    if (path49) {
+      paths.push(`<path d="${path49}" transform="translate(${cursorX} 0)"/>`);
     }
+    cursorX += glyphAdvanceRatio2[character] ?? (character === " " ? spaceWidthRatio : glyphWidthRatio);
   }
-}, drawText2 = ({
-  rgba,
+  const renderedSize = maxWidth === undefined || cursorX === 0 ? size : Math.min(size, maxWidth / cursorX);
+  return `<g fill="none" stroke="#111" stroke-width="${strokeWidthRatio}" stroke-linecap="round" stroke-linejoin="round" transform="translate(${x4} ${top - 0.24 * renderedSize}) scale(${renderedSize})">${paths.join("")}</g>`;
+}, createBitmapLegendSvg = ({
   width,
-  x: x4,
-  y: y4,
-  text,
-  color,
-  scale: scale6 = 2
+  height,
+  legend
 }) => {
-  let cursorX = x4;
-  for (const char of text.toUpperCase()) {
-    const glyph = glyphs[char] ?? glyphs[" "];
-    for (let gy3 = 0;gy3 < glyph.length; gy3++) {
-      const row = glyph[gy3];
-      for (let gx3 = 0;gx3 < row.length; gx3++) {
-        if (row[gx3] !== "1")
-          continue;
-        fillRect({
-          rgba,
-          width,
-          x: cursorX + gx3 * scale6,
-          y: y4 + gy3 * scale6,
-          rectWidth: scale6,
-          rectHeight: scale6,
-          color
-        });
-      }
-    }
-    cursorX += (glyph[0].length + 1) * scale6;
-  }
-}, getLegendLabel = (entry) => {
-  const labels = entry.labels.length > 0 ? entry.labels.join(",") : entry.connectivityKey;
-  return labels.length > 36 ? `${labels.slice(0, 33)}...` : labels;
+  const headerHeight = 26;
+  const rowHeight = 20;
+  const rows = [
+    ...markerLegend.map((entry, index) => `
+    <rect x="10" y="${headerHeight + index * rowHeight + 3}" width="14" height="10" rx="1" fill="${entry.color}"/>
+    ${createAlphabetTextSvg({
+      text: entry.label,
+      x: 32,
+      top: headerHeight + index * rowHeight + 2,
+      size: 16,
+      maxWidth: width - 42
+    })}`),
+    ...legend.map((entry, index) => `
+    <rect x="10" y="${headerHeight + (markerLegend.length + index) * rowHeight + 3}" width="14" height="10" rx="1" fill="rgb(${entry.color.join(",")})"/>
+    ${createAlphabetTextSvg({
+      text: getLegendLabel(entry),
+      x: 32,
+      top: headerHeight + (markerLegend.length + index) * rowHeight + 2,
+      size: 16,
+      maxWidth: width - 42
+    })}`)
+  ].join("");
+  return `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${width} ${height}">
+  <rect width="100%" height="100%" fill="white"/>
+  ${createAlphabetTextSvg({ text: "Legend", x: 10, top: 4, size: 15 })}${rows}
+</svg>`;
 }, appendBitmapLegend = (debugRender) => {
-  const rowHeight = 18;
-  const legendRows = Math.max(1, debugRender.legend.length + 2);
-  const legendHeight = legendRows * rowHeight + 8;
+  const legendHeight = 34 + (markerLegend.length + debugRender.legend.length) * 20;
   const width = debugRender.width;
   const height = debugRender.height + legendHeight;
   const rgba = new Uint8Array(width * height * 4);
-  for (let i4 = 0;i4 < width * height; i4++) {
-    setPixel(rgba, width, i4 % width, Math.floor(i4 / width), [255, 255, 255]);
-  }
   for (let y4 = 0;y4 < debugRender.height; y4++) {
     rgba.set(debugRender.rgba.subarray(y4 * debugRender.width * 4, (y4 + 1) * debugRender.width * 4), y4 * width * 4);
   }
-  const legendY = debugRender.height + 8;
-  drawText2({
-    rgba,
+  const legendPng = decodePng(renderSvgToPng(createBitmapLegendSvg({
     width,
-    x: 10,
-    y: legendY,
-    text: "LEGEND",
-    color: [0, 0, 0]
-  });
-  drawText2({
-    rgba,
-    width,
-    x: 96,
-    y: legendY,
-    text: "RED:SHORT MARKER ORANGE:PORT BLACK:UNASSIGNED",
-    color: [0, 0, 0]
-  });
-  debugRender.legend.forEach((entry, index) => {
-    const y4 = legendY + rowHeight * (index + 1);
-    fillRect({
-      rgba,
-      width,
-      x: 10,
-      y: y4,
-      rectWidth: 14,
-      rectHeight: 10,
-      color: entry.color
-    });
-    drawText2({
-      rgba,
-      width,
-      x: 32,
-      y: y4,
-      text: getLegendLabel(entry),
-      color: [0, 0, 0]
-    });
-  });
+    height: legendHeight,
+    legend: debugRender.legend
+  })));
+  if (legendPng.width !== width || legendPng.height !== legendHeight || legendPng.channels !== 4 || legendPng.depth !== 8) {
+    throw new Error("Unable to render bitmap debug legend");
+  }
+  rgba.set(legendPng.data, debugRender.height * width * 4);
   return { ...debugRender, width, height, rgba };
 };
 var init_dist3 = __esm(() => {
@@ -78501,6 +78434,7 @@ var init_dist3 = __esm(() => {
   init_dist();
   init_lib();
   init_dist2();
+  init_lib();
   import_gerber_to_svg = __toESM2(require_gerber_to_svg(), 1);
   crcTable2 = new Uint32Array(256);
   for (let i4 = 0;i4 < crcTable2.length; i4++) {
@@ -78511,51 +78445,11 @@ var init_dist3 = __esm(() => {
     crcTable2[i4] = crc2 >>> 0;
   }
   textEncoder = new TextEncoder;
-  glyphs = {
-    " ": ["000", "000", "000", "000", "000"],
-    ".": ["0", "0", "0", "0", "1"],
-    ":": ["0", "1", "0", "1", "0"],
-    _: ["000", "000", "000", "000", "111"],
-    "-": ["000", "000", "111", "000", "000"],
-    ">": ["100", "010", "001", "010", "100"],
-    "/": ["001", "001", "010", "100", "100"],
-    "0": ["111", "101", "101", "101", "111"],
-    "1": ["010", "110", "010", "010", "111"],
-    "2": ["111", "001", "111", "100", "111"],
-    "3": ["111", "001", "111", "001", "111"],
-    "4": ["101", "101", "111", "001", "001"],
-    "5": ["111", "100", "111", "001", "111"],
-    "6": ["111", "100", "111", "101", "111"],
-    "7": ["111", "001", "010", "010", "010"],
-    "8": ["111", "101", "111", "101", "111"],
-    "9": ["111", "101", "111", "001", "111"],
-    A: ["010", "101", "111", "101", "101"],
-    B: ["110", "101", "110", "101", "110"],
-    C: ["011", "100", "100", "100", "011"],
-    D: ["110", "101", "101", "101", "110"],
-    E: ["111", "100", "110", "100", "111"],
-    F: ["111", "100", "110", "100", "100"],
-    G: ["011", "100", "101", "101", "011"],
-    H: ["101", "101", "111", "101", "101"],
-    I: ["111", "010", "010", "010", "111"],
-    J: ["001", "001", "001", "101", "111"],
-    K: ["101", "101", "110", "101", "101"],
-    L: ["100", "100", "100", "100", "111"],
-    M: ["101", "111", "111", "101", "101"],
-    N: ["101", "111", "111", "111", "101"],
-    O: ["111", "101", "101", "101", "111"],
-    P: ["111", "101", "111", "100", "100"],
-    Q: ["111", "101", "101", "111", "001"],
-    R: ["110", "101", "110", "101", "101"],
-    S: ["111", "100", "111", "001", "111"],
-    T: ["111", "010", "010", "010", "010"],
-    U: ["101", "101", "101", "101", "111"],
-    V: ["101", "101", "101", "101", "010"],
-    W: ["101", "101", "111", "111", "101"],
-    X: ["101", "101", "010", "101", "101"],
-    Y: ["101", "101", "010", "010", "010"],
-    Z: ["111", "001", "010", "100", "111"]
-  };
+  markerLegend = [
+    { color: "#ff00ff", label: "Short marker" },
+    { color: "#ffa500", label: "PCB port" },
+    { color: "#000000", label: "Unassigned" }
+  ];
 });
 
 // node_modules/circuit-json-trace-length-analysis/lib/analyze-circuit-json-trace-length.ts
@@ -120694,19 +120588,19 @@ var require_StandardFontEmbedder = __commonJS((exports2) => {
       this.customName = customName;
     }
     StandardFontEmbedder2.prototype.encodeText = function(text) {
-      var glyphs2 = this.encodeTextAsGlyphs(text);
-      var hexCodes = new Array(glyphs2.length);
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        hexCodes[idx] = utils_1.toHexString(glyphs2[idx].code);
+      var glyphs = this.encodeTextAsGlyphs(text);
+      var hexCodes = new Array(glyphs.length);
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        hexCodes[idx] = utils_1.toHexString(glyphs[idx].code);
       }
       return PDFHexString_1.default.of(hexCodes.join(""));
     };
     StandardFontEmbedder2.prototype.widthOfTextAtSize = function(text, size) {
-      var glyphs2 = this.encodeTextAsGlyphs(text);
+      var glyphs = this.encodeTextAsGlyphs(text);
       var totalWidth = 0;
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        var left = glyphs2[idx].name;
-        var right = (glyphs2[idx + 1] || {}).name;
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        var left = glyphs[idx].name;
+        var right = (glyphs[idx + 1] || {}).name;
         var kernAmount = this.font.getXAxisKerningForPair(left, right) || 0;
         totalWidth += this.widthOfGlyph(left) + kernAmount;
       }
@@ -120751,12 +120645,12 @@ var require_StandardFontEmbedder = __commonJS((exports2) => {
     };
     StandardFontEmbedder2.prototype.encodeTextAsGlyphs = function(text) {
       var codePoints = Array.from(text);
-      var glyphs2 = new Array(codePoints.length);
+      var glyphs = new Array(codePoints.length);
       for (var idx = 0, len = codePoints.length;idx < len; idx++) {
         var codePoint = utils_1.toCodePoint(codePoints[idx]);
-        glyphs2[idx] = this.encoding.encodeUnicodeCodePoint(codePoint);
+        glyphs[idx] = this.encoding.encodeUnicodeCodePoint(codePoint);
       }
-      return glyphs2;
+      return glyphs;
     };
     StandardFontEmbedder2.for = function(fontName, customName) {
       return new StandardFontEmbedder2(fontName, customName);
@@ -120772,10 +120666,10 @@ var require_CMap = __commonJS((exports2) => {
   exports2.createCmap = undefined;
   var utils_1 = require_utils8();
   var unicode_1 = require_unicode();
-  exports2.createCmap = function(glyphs2, glyphId) {
-    var bfChars = new Array(glyphs2.length);
-    for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-      var glyph = glyphs2[idx];
+  exports2.createCmap = function(glyphs, glyphId) {
+    var bfChars = new Array(glyphs.length);
+    for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+      var glyph = glyphs[idx];
       var id2 = cmapHexFormat(cmapHexString(glyphId(glyph)));
       var unicode = cmapHexFormat.apply(undefined, glyph.codePoints.map(cmapCodePointFormat));
       bfChars[idx] = [id2, unicode];
@@ -121002,12 +120896,12 @@ var require_CustomFontEmbedder = __commonJS((exports2) => {
     function CustomFontEmbedder2(font, fontData, customName, fontFeatures) {
       var _this = this;
       this.allGlyphsInFontSortedById = function() {
-        var glyphs2 = new Array(_this.font.characterSet.length);
-        for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
+        var glyphs = new Array(_this.font.characterSet.length);
+        for (var idx = 0, len = glyphs.length;idx < len; idx++) {
           var codePoint = _this.font.characterSet[idx];
-          glyphs2[idx] = _this.font.glyphForCodePoint(codePoint);
+          glyphs[idx] = _this.font.glyphForCodePoint(codePoint);
         }
-        return utils_1.sortedUniq(glyphs2.sort(utils_1.byAscendingId), function(g6) {
+        return utils_1.sortedUniq(glyphs.sort(utils_1.byAscendingId), function(g6) {
           return g6.id;
         });
       };
@@ -121035,18 +120929,18 @@ var require_CustomFontEmbedder = __commonJS((exports2) => {
       });
     };
     CustomFontEmbedder2.prototype.encodeText = function(text) {
-      var glyphs2 = this.font.layout(text, this.fontFeatures).glyphs;
-      var hexCodes = new Array(glyphs2.length);
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        hexCodes[idx] = utils_1.toHexStringOfMinLength(glyphs2[idx].id, 4);
+      var glyphs = this.font.layout(text, this.fontFeatures).glyphs;
+      var hexCodes = new Array(glyphs.length);
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        hexCodes[idx] = utils_1.toHexStringOfMinLength(glyphs[idx].id, 4);
       }
       return PDFHexString_1.default.of(hexCodes.join(""));
     };
     CustomFontEmbedder2.prototype.widthOfTextAtSize = function(text, size) {
-      var glyphs2 = this.font.layout(text, this.fontFeatures).glyphs;
+      var glyphs = this.font.layout(text, this.fontFeatures).glyphs;
       var totalWidth = 0;
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        totalWidth += glyphs2[idx].advanceWidth * this.scale;
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        totalWidth += glyphs[idx].advanceWidth * this.scale;
       }
       var scale6 = size / 1000;
       return totalWidth * scale6;
@@ -121196,12 +121090,12 @@ var require_CustomFontEmbedder = __commonJS((exports2) => {
       return glyph ? glyph.id : -1;
     };
     CustomFontEmbedder2.prototype.computeWidths = function() {
-      var glyphs2 = this.glyphCache.access();
+      var glyphs = this.glyphCache.access();
       var widths = [];
       var currSection = [];
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        var currGlyph = glyphs2[idx];
-        var prevGlyph = glyphs2[idx - 1];
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        var currGlyph = glyphs[idx];
+        var prevGlyph = glyphs[idx - 1];
         var currGlyphId = this.glyphId(currGlyph);
         var prevGlyphId = this.glyphId(prevGlyph);
         if (idx === 0) {
@@ -121255,10 +121149,10 @@ var require_CustomFontSubsetEmbedder = __commonJS((exports2) => {
       });
     };
     CustomFontSubsetEmbedder2.prototype.encodeText = function(text) {
-      var glyphs2 = this.font.layout(text, this.fontFeatures).glyphs;
-      var hexCodes = new Array(glyphs2.length);
-      for (var idx = 0, len = glyphs2.length;idx < len; idx++) {
-        var glyph = glyphs2[idx];
+      var glyphs = this.font.layout(text, this.fontFeatures).glyphs;
+      var hexCodes = new Array(glyphs.length);
+      for (var idx = 0, len = glyphs.length;idx < len; idx++) {
+        var glyph = glyphs[idx];
         var subsetGlyphId = this.subset.includeGlyph(glyph);
         this.glyphs[subsetGlyphId - 1] = glyph;
         this.glyphIdMap.set(glyph.id, subsetGlyphId);
@@ -135252,7 +135146,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.1879";
+var version = "0.1.1880";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -135264,7 +135158,7 @@ var package_default = {
   devDependencies: {
     "@babel/standalone": "^7.26.9",
     "@biomejs/biome": "^1.9.4",
-    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",
@@ -309596,7 +309490,7 @@ import {
   getRotationBetweenPcbPin1Locations
 } from "circuit-json";
 var fixedDecimals = 3;
-var normalizeRotation = (rotation11) => (rotation11 % 360 + 360) % 360;
+var normalizeRotation2 = (rotation11) => (rotation11 % 360 + 360) % 360;
 var getPickAndPlaceRotation = (pcbComponent, supplier) => {
   if (!supplier || !pcbComponent.pin1_location)
     return pcbComponent.rotation;
@@ -309606,7 +309500,7 @@ var getPickAndPlaceRotation = (pcbComponent, supplier) => {
   const rotationAdjustment = getRotationBetweenPcbPin1Locations(supplierPin1Location, pcbComponent.pin1_location);
   if (rotationAdjustment === null)
     return pcbComponent.rotation;
-  return normalizeRotation(pcbComponent.rotation + rotationAdjustment);
+  return normalizeRotation2(pcbComponent.rotation + rotationAdjustment);
 };
 var convertCircuitJsonToPickAndPlaceRows = (circuitJson, opts = {}) => {
   const rows = [];

package/dist/lib/index.js

@@ -65757,7 +65757,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1879";
+var version = "0.1.1880";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65769,7 +65769,7 @@ var package_default = {
   devDependencies: {
     "@babel/standalone": "^7.26.9",
     "@biomejs/biome": "^1.9.4",
-    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1880",
+  "version": "0.1.1882",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -9,7 +9,7 @@
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
     "@biomejs/biome": "^1.9.4",
-    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.6",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.6",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#bb0b41d80c9714695b498e182c2a558f1e0ceb2d",