@tscircuit/cli 0.1.1681 → 0.1.1682

package/dist/cli/main.js

@@ -77810,7 +77810,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     layers: [renderLayer]
   });
   return ctx.pixels;
-}, includePointInBounds = (bounds, point9, margin = 0) => mergeBounds2(bounds, {
+}, COPPER_POUR_PAINT_PRIORITY = 1, OTHER_COPPER_PAINT_PRIORITY = 2, includePointInBounds = (bounds, point9, margin = 0) => mergeBounds2(bounds, {
   minX: point9.x - margin,
   maxX: point9.x + margin,
   minY: point9.y - margin,
@@ -77964,6 +77964,58 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
     maxY: boardBounds.maxY - (rect.y - offsetY) / scale6,
     minY: boardBounds.maxY - (rect.y + rect.height - offsetY) / scale6
   };
+}, createBitmapMask = async ({
+  elements,
+  boardBounds,
+  width,
+  height,
+  layer,
+  mode
+}) => {
+  const groupBounds = getGroupBounds({ elements, boardBounds });
+  const rect = getPixelRectFromBounds({
+    bounds: groupBounds,
+    boardBounds,
+    width,
+    height
+  });
+  if (rect.width === 0 || rect.height === 0)
+    return null;
+  const maskBounds = getBoundsFromPixelRect({
+    rect,
+    boardBounds,
+    width,
+    height
+  });
+  const mask = await createGroupMask({
+    elements,
+    bounds: maskBounds,
+    width: rect.width,
+    height: rect.height,
+    layer,
+    mode
+  });
+  return { rect, mask };
+}, paintBitmapMask = ({
+  bitmapMask,
+  color,
+  priority,
+  width,
+  rgba,
+  paintPriorities
+}) => {
+  const { mask, rect } = bitmapMask;
+  for (let i4 = 0;i4 < mask.length; i4++) {
+    if (mask[i4] === 0)
+      continue;
+    const localX = i4 % rect.width;
+    const localY = Math.floor(i4 / rect.width);
+    const pixelIndex = (rect.y + localY) * width + rect.x + localX;
+    if (paintPriorities[pixelIndex] >= priority)
+      continue;
+    paintPriorities[pixelIndex] = priority;
+    setRgbaPixel(rgba, pixelIndex, color);
+  }
 }, createShortsFromPixelGroups = ({
   shortPixelGroups,
   bounds,
@@ -78041,6 +78093,7 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   const pixelOwners = new Array(width * height);
   const shortPixelGroupMap = new Map;
   const rgba = new Uint8Array(width * height * 4);
+  const paintPriorities = new Uint8Array(width * height);
   for (let i4 = 0;i4 < width * height; i4++) {
     setRgbaPixel(rgba, i4, [0, 0, 0]);
   }
@@ -78048,35 +78101,22 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
   const legend = buildBitmapLegend({ sortedConnectivityGroups, db: db2 });
   for (const [key, elements] of sortedConnectivityGroups) {
     const color = getDebugColorForConnectivityKey(key);
-    const groupBounds = getGroupBounds({ elements, boardBounds: bounds });
-    const rect = getPixelRectFromBounds({
-      bounds: groupBounds,
-      boardBounds: bounds,
-      width,
-      height
-    });
-    if (rect.width === 0 || rect.height === 0)
-      continue;
-    const maskBounds = getBoundsFromPixelRect({
-      rect,
+    const bitmapMask = await createBitmapMask({
+      elements,
       boardBounds: bounds,
       width,
-      height
-    });
-    const mask = await createGroupMask({
-      elements,
-      bounds: maskBounds,
-      width: rect.width,
-      height: rect.height,
+      height,
       layer,
       mode
     });
-    for (let i4 = 0;i4 < mask.length; i4++) {
-      if (mask[i4] === 0)
+    if (!bitmapMask)
+      continue;
+    for (let i4 = 0;i4 < bitmapMask.mask.length; i4++) {
+      if (bitmapMask.mask[i4] === 0)
         continue;
-      const localX = i4 % rect.width;
-      const localY = Math.floor(i4 / rect.width);
-      const globalPixelIndex = (rect.y + localY) * width + rect.x + localX;
+      const localX = i4 % bitmapMask.rect.width;
+      const localY = Math.floor(i4 / bitmapMask.rect.width);
+      const globalPixelIndex = (bitmapMask.rect.y + localY) * width + bitmapMask.rect.x + localX;
       const existingOwner = pixelOwners[globalPixelIndex];
       if (existingOwner && existingOwner !== key) {
         const [firstConnectivityKey, secondConnectivityKey] = [
@@ -78102,9 +78142,68 @@ var import_gerber_to_svg, renderTscircuitRepro = async (tsx, options = {}) => {
         }
       } else if (!existingOwner) {
         pixelOwners[globalPixelIndex] = key;
-        setRgbaPixel(rgba, globalPixelIndex, color);
       }
     }
+    const copperPourElements = elements.filter((element) => element.type === "pcb_copper_pour");
+    const nonPourElements = elements.filter((element) => element.type !== "pcb_copper_pour");
+    if (copperPourElements.length === 0) {
+      paintBitmapMask({
+        bitmapMask,
+        color,
+        priority: OTHER_COPPER_PAINT_PRIORITY,
+        width,
+        rgba,
+        paintPriorities
+      });
+      continue;
+    }
+    if (nonPourElements.length === 0) {
+      paintBitmapMask({
+        bitmapMask,
+        color,
+        priority: COPPER_POUR_PAINT_PRIORITY,
+        width,
+        rgba,
+        paintPriorities
+      });
+      continue;
+    }
+    const copperPourMask = await createBitmapMask({
+      elements: copperPourElements,
+      boardBounds: bounds,
+      width,
+      height,
+      layer,
+      mode
+    });
+    if (copperPourMask) {
+      paintBitmapMask({
+        bitmapMask: copperPourMask,
+        color,
+        priority: COPPER_POUR_PAINT_PRIORITY,
+        width,
+        rgba,
+        paintPriorities
+      });
+    }
+    const nonPourMask = await createBitmapMask({
+      elements: nonPourElements,
+      boardBounds: bounds,
+      width,
+      height,
+      layer,
+      mode
+    });
+    if (nonPourMask) {
+      paintBitmapMask({
+        bitmapMask: nonPourMask,
+        color,
+        priority: OTHER_COPPER_PAINT_PRIORITY,
+        width,
+        rgba,
+        paintPriorities
+      });
+    }
   }
   const shorts = createShortsFromPixelGroups({
     shortPixelGroups: [...shortPixelGroupMap.values()],
@@ -118348,7 +118447,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.1680";
+var version = "0.1.1681";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -118360,7 +118459,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.10.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.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#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",

package/dist/lib/index.js

@@ -65812,7 +65812,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1680";
+var version = "0.1.1681";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65824,7 +65824,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.10.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.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#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1681",
+  "version": "0.1.1682",
   "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.10.tgz",
+    "@tscircuit/check-shorts": "https://jscdn.tscircuit.com/@tscircuit/check-shorts/0.0.12.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#b6d5fe675adc26a2fc988aa081e6fb51e6bf696a",