@tscircuit/cli 0.1.2087 → 0.1.2088

package/dist/cli/main.js

@@ -79831,7 +79831,7 @@ class BitmapCanvasContext {
   pathParts = [];
   currentPolygon = null;
   constructor(width, height) {
-    this.canvas = { width, height };
+    this.canvas = createBitmapCanvasSurface(width, height);
     this.pixels = new Uint8Array(width * height);
   }
   beginPath() {
@@ -80380,7 +80380,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   const svg = await renderGerberToSvg(gerber);
   const boardSvg = forceSvgViewport({ svg, bounds, width, height });
   return getMaskFromPng(renderSvgToPng(boardSvg));
-}, transformPoint = (matrix, point) => applyToPoint34(matrix, point), getBounds2 = (parts) => {
+}, createBitmapCanvasSurface = (width, height) => Object.assign(Object.create(null), { width, height }), transformPoint = (matrix, point) => applyToPoint34(matrix, point), getBounds2 = (parts) => {
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
   let maxX = Number.NEGATIVE_INFINITY;
@@ -80498,9 +80498,9 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   let bounds = null;
   for (const point of element.route) {
     if ("start" in point && "end" in point) {
-      const margin2 = (point.width ?? 0) / 2;
-      bounds = includePointInBounds(bounds, point.start, margin2);
-      bounds = includePointInBounds(bounds, point.end, margin2);
+      const margin = (point.width ?? 0) / 2;
+      bounds = includePointInBounds(bounds, point.start, margin);
+      bounds = includePointInBounds(bounds, point.end, margin);
       continue;
     }
     if (!("x" in point) || !("y" in point))
@@ -80775,10 +80775,25 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
       const localX = i % bitmapMask.rect.width;
       const localY = Math.floor(i / bitmapMask.rect.width);
       const globalPixelIndex = (bitmapMask.rect.y + localY) * width + bitmapMask.rect.x + localX;
-      const existingOwner = pixelOwners[globalPixelIndex];
-      if (existingOwner && existingOwner !== key) {
+      const x = bitmapMask.rect.x + localX;
+      const y = bitmapMask.rect.y + localY;
+      const contactingOwners = new Set;
+      for (let dy = -1;dy <= 1; dy++) {
+        const ny = y + dy;
+        if (ny < 0 || ny >= height)
+          continue;
+        for (let dx = -1;dx <= 1; dx++) {
+          const nx = x + dx;
+          if (nx < 0 || nx >= width)
+            continue;
+          const owner = pixelOwners[ny * width + nx];
+          if (owner && owner !== key)
+            contactingOwners.add(owner);
+        }
+      }
+      for (const owner of contactingOwners) {
         const [firstConnectivityKey, secondConnectivityKey] = [
-          existingOwner,
+          owner,
           key
         ].sort();
         const shortKey = `${layer}:${firstConnectivityKey}:${secondConnectivityKey}`;
@@ -80798,7 +80813,8 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
             secondOwnerLabels: getUniqueOwnerLabels(secondElements, db)
           });
         }
-      } else if (!existingOwner) {
+      }
+      if (!pixelOwners[globalPixelIndex]) {
         pixelOwners[globalPixelIndex] = key;
       }
     }
@@ -80990,10 +81006,30 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     createChunk("IDAT", deflateSync2(scanlines, { level: 1 })),
     createChunk("IEND", new Uint8Array)
   ]);
-}, getLegendLabel = (entry) => {
-  const labels = entry.labels.length > 0 ? entry.labels.join(",") : entry.connectivityKey;
-  return labels.length > 36 ? `${labels.slice(0, 33)}...` : labels;
-}, markerLegend, createAlphabetTextSvg = ({
+}, markerLegend, getGlyphAdvance = (character) => glyphAdvanceRatio3[character] ?? (character === " " ? spaceWidthRatio2 : glyphWidthRatio2), getAlphabetTextWidth = (text, size) => {
+  let width = 0;
+  for (const character of text) {
+    width += getGlyphAdvance(character) * size;
+  }
+  return width;
+}, getLegendLabel = (entry, maxWidth, size = 16) => {
+  const label = entry.labels.length > 0 ? entry.labels.join(",") : entry.connectivityKey;
+  if (getAlphabetTextWidth(label, size) <= maxWidth)
+    return label;
+  const ellipsis = "...";
+  let fittedLabel = "";
+  let fittedWidth = getAlphabetTextWidth(ellipsis, size);
+  if (fittedWidth > maxWidth)
+    return "";
+  for (const character of label) {
+    const characterWidth = getGlyphAdvance(character) * size;
+    if (fittedWidth + characterWidth > maxWidth)
+      break;
+    fittedLabel += character;
+    fittedWidth += characterWidth;
+  }
+  return `${fittedLabel}${ellipsis}`;
+}, createAlphabetTextSvg = ({
   text,
   x,
   top,
@@ -81007,7 +81043,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     if (path) {
       paths.push(`<path d="${path}" transform="translate(${cursorX} 0)"/>`);
     }
-    cursorX += glyphAdvanceRatio3[character] ?? (character === " " ? spaceWidthRatio2 : glyphWidthRatio2);
+    cursorX += getGlyphAdvance(character);
   }
   const renderedSize = maxWidth === undefined || cursorX === 0 ? size : Math.min(size, maxWidth / cursorX);
   return `<g fill="none" stroke="#111" stroke-width="${strokeWidthRatio2}" stroke-linecap="round" stroke-linejoin="round" transform="translate(${x} ${top - 0.24 * renderedSize}) scale(${renderedSize})">${paths.join("")}</g>`;
@@ -81028,15 +81064,19 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
       size: 16,
       maxWidth: width - 42
     })}`),
-    ...legend.map((entry, index) => `
+    ...legend.map((entry, index) => {
+      const labelMaxWidth = width - 42;
+      const labelSize = 16;
+      return `
     <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
-    })}`)
+        text: getLegendLabel(entry, labelMaxWidth, labelSize),
+        x: 32,
+        top: headerHeight + (markerLegend.length + index) * rowHeight + 2,
+        size: labelSize,
+        maxWidth: labelMaxWidth
+      })}`;
+    })
   ].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"/>
@@ -153438,7 +153478,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.2086";
+var version = "0.1.2087";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -153454,7 +153494,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.19.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.24.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.15",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#41260fc05b736c0f3fdc33892b6da0ece40107b9",

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2086";
+var version = "0.1.2087";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69125,7 +69125,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.19.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.24.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.15",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#41260fc05b736c0f3fdc33892b6da0ece40107b9",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2087",
+  "version": "0.1.2088",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
     "@biomejs/biome": "^1.9.4",
-    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.19.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.24.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.15",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
     "@tscircuit/circuit-json-schematic-placement-analysis": "github:tscircuit/circuit-json-schematic-placement-analysis#41260fc05b736c0f3fdc33892b6da0ece40107b9",