@tscircuit/cli 0.1.2037 → 0.1.2038

package/dist/cli/main.js

@@ -56970,7 +56970,7 @@ var require_fast_json_stable_stringify = __commonJS2(function(exports2, module2)
   };
 });
 
-// node_modules/circuit-json-to-gerber/dist/chunk-X27MJBIZ.js
+// node_modules/circuit-json-to-gerber/dist/chunk-WLO6XF2E.js
 import { z as z4 } from "zod";
 import { z as z23 } from "zod";
 import { z as z32 } from "zod";
@@ -57031,6 +57031,7 @@ import {
   translate as translate8
 } from "transformation-matrix";
 import { getBoundFromCenteredRect as getBoundFromCenteredRect2 } from "@tscircuit/math-utils";
+import { applyToPoint as applyToPoint27, compose as compose22, rotate as rotate22, translate as translate22 } from "transformation-matrix";
 import {
   glyphAdvanceRatio,
   glyphWidthRatio,
@@ -57046,16 +57047,15 @@ import {
   translate as translate52
 } from "transformation-matrix";
 import { getBoundFromCenteredRect as getBoundFromCenteredRect3 } from "@tscircuit/math-utils";
-import { applyToPoint as applyToPoint27, compose as compose22, rotate as rotate22, translate as translate22 } from "transformation-matrix";
+import { applyToPoint as applyToPoint32, compose as compose32, rotate as rotate32, translate as translate32 } from "transformation-matrix";
 import { getBoundFromCenteredRect as getBoundFromCenteredRect4 } from "@tscircuit/math-utils";
 import {
-  applyToPoint as applyToPoint32,
-  compose as compose32,
+  applyToPoint as applyToPoint42,
+  compose as compose42,
   identity as identity22,
-  rotate as rotate32,
-  translate as translate32
+  rotate as rotate42,
+  translate as translate42
 } from "transformation-matrix";
-import { applyToPoint as applyToPoint42, compose as compose42, rotate as rotate42, translate as translate42 } from "transformation-matrix";
 function pairs3(arr) {
   const result = [];
   for (let i = 0;i < arr.length - 1; i++) {
@@ -57191,6 +57191,13 @@ function getAllApertureTemplateConfigsForLayer({
         } else {
           addConfigIfNew(getApertureConfigFromPcbPlatedHole(elm));
         }
+        if ("rect_pad_width" in elm && typeof elm.rect_pad_width === "number" && "rect_pad_height" in elm && typeof elm.rect_pad_height === "number" && "rect_ccw_rotation" in elm && typeof elm.rect_ccw_rotation === "number" && isGeometryChangingRectRotation({
+          width: elm.rect_pad_width,
+          height: elm.rect_pad_height,
+          ccwRotationDegrees: elm.rect_ccw_rotation
+        })) {
+          addConfigIfNew(REGION_APERTURE_CONFIG);
+        }
       }
     } else if (elm.type === "pcb_hole") {
       if (!isCopperLayer && !isSoldermaskLayer)
@@ -57366,12 +57373,6 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   if (element.type !== "pcb_plated_hole" && element.type !== "pcb_via") {
     return;
   }
-  if ("from_layer" in element && typeof element.from_layer === "string" && "to_layer" in element && typeof element.to_layer === "string") {
-    return normalizeLayerSpan({
-      from_layer: element.from_layer,
-      to_layer: element.to_layer
-    }, layerCount);
-  }
   let layers = [];
   if ("layers" in element && Array.isArray(element.layers)) {
     layers = element.layers;
@@ -57383,6 +57384,12 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       to_layer: sortedLayers[sortedLayers.length - 1]
     };
   }
+  if ("from_layer" in element && typeof element.from_layer === "string" && "to_layer" in element && typeof element.to_layer === "string") {
+    return normalizeLayerSpan({
+      from_layer: element.from_layer,
+      to_layer: element.to_layer
+    }, layerCount);
+  }
   return {
     from_layer: "top",
     to_layer: "bottom"
@@ -57428,8 +57435,22 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   const requestedLayerSpan = getRequestedLayerSpan(layer_span);
   const span = normalizeLayerSpan(requestedLayerSpan, layerCount);
   return `Plated,${getLayerNumber(span.from_layer, layerCount)},${getLayerNumber(span.to_layer, layerCount)},PTH`;
-}, getTraceRouteViaElements = (circuitJson) => {
+}, getViaDrillLocationKey = (via) => JSON.stringify([via.x, via.y, via.hole_diameter]), getTraceRouteViaElements = (circuitJson) => {
   const routeVias = [];
+  const layerCount = getLayerCount(circuitJson);
+  const physicalViaSpans = /* @__PURE__ */ new Map;
+  for (const element of circuitJson) {
+    if (element.type !== "pcb_via")
+      continue;
+    const span = getPlatedElementLayerSpan(element, layerCount);
+    const key = getViaDrillLocationKey(element);
+    const spans = physicalViaSpans.get(key) ?? [];
+    spans.push({
+      firstLayer: getLayerNumber(span.from_layer, layerCount),
+      lastLayer: getLayerNumber(span.to_layer, layerCount)
+    });
+    physicalViaSpans.set(key, spans);
+  }
   for (const element of circuitJson) {
     if (element.type !== "pcb_trace") {
       continue;
@@ -57440,6 +57461,16 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       }
       const fromLayer = point.from_layer;
       const toLayer = point.to_layer;
+      const fromLayerNumber = getLayerNumber(fromLayer, layerCount);
+      const toLayerNumber = getLayerNumber(toLayer, layerCount);
+      const existingSpans = physicalViaSpans.get(getViaDrillLocationKey({
+        x: point.x,
+        y: point.y,
+        hole_diameter: point.hole_diameter
+      }));
+      if (existingSpans?.some(({ firstLayer, lastLayer }) => firstLayer <= Math.min(fromLayerNumber, toLayerNumber) && lastLayer >= Math.max(fromLayerNumber, toLayerNumber))) {
+        continue;
+      }
       routeVias.push({
         type: "pcb_via",
         pcb_via_id: `${element.pcb_trace_id}_route_via_${index}`,
@@ -57454,10 +57485,20 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     }
   }
   return routeVias;
-}, getDrillableElements = (circuitJson) => [
-  ...circuitJson,
-  ...getTraceRouteViaElements(circuitJson)
-], circleCutoutPolygonSegmentCount = 64, getBoardOutlinePolygons = (circuitJson) => {
+}, getDrillableElements = (circuitJson) => {
+  const layerCount = getLayerCount(circuitJson);
+  const seenViaDrills = /* @__PURE__ */ new Set;
+  return [...circuitJson, ...getTraceRouteViaElements(circuitJson)].filter((element) => {
+    if (element.type !== "pcb_via")
+      return true;
+    const span = getPlatedElementLayerSpan(element, layerCount);
+    const key = `${getViaDrillLocationKey(element)}:${span.from_layer}:${span.to_layer}`;
+    if (seenViaDrills.has(key))
+      return false;
+    seenViaDrills.add(key);
+    return true;
+  });
+}, circleCutoutPolygonSegmentCount = 64, getBoardOutlinePolygons = (circuitJson) => {
   return circuitJson.flatMap((element) => {
     if (element.type !== "pcb_board") {
       return [];
@@ -57585,7 +57626,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     return element.ccw_rotation;
   }
   return 0;
-}, convertSoupToExcellonDrillCommands = ({
+}, convertCircuitJsonToExcellonDrillCommands = ({
   circuitJson,
   is_plated,
   flip_y_axis = false,
@@ -57731,7 +57772,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     return true;
   }
   return "hole_width" in element && typeof element.hole_width === "number" && "hole_height" in element && typeof element.hole_height === "number";
-}, convertSoupToExcellonDrillCommandLayers = ({
+}, convertCircuitJsonToExcellonDrillCommandLayers = ({
   circuitJson,
   flip_y_axis = false
 }) => {
@@ -57745,7 +57786,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   }));
   const platedDrillLayers = Object.fromEntries([...platedSpans.entries()].sort().map(([spanKey, span]) => [
     `drill-${spanKey}.drl`,
-    convertSoupToExcellonDrillCommands({
+    convertCircuitJsonToExcellonDrillCommands({
       circuitJson,
       is_plated: true,
       flip_y_axis,
@@ -57761,7 +57802,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   }
   return {
     ...platedDrillLayers,
-    "drill_npth.drl": convertSoupToExcellonDrillCommands({
+    "drill_npth.drl": convertCircuitJsonToExcellonDrillCommands({
       circuitJson,
       is_plated: false,
       flip_y_axis
@@ -57953,6 +57994,31 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     default:
       return null;
   }
+}, isGeometryChangingRectRotation = ({
+  width,
+  height,
+  ccwRotationDegrees
+}) => {
+  const isSquare = Math.abs(width - height) <= 0.000000001;
+  const symmetryPeriod = isSquare ? 90 : 180;
+  const normalizedRotation = (ccwRotationDegrees % symmetryPeriod + symmetryPeriod) % symmetryPeriod;
+  return normalizedRotation > 0.000000001 && symmetryPeriod - normalizedRotation > 0.000000001;
+}, getRotatedRectPoints = ({
+  center,
+  width,
+  height,
+  ccwRotationDegrees
+}) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  const ccwRotationRadians = ccwRotationDegrees * Math.PI / 180;
+  const rectToPcbTransform = compose22(translate22(center.x, center.y), rotate22(ccwRotationRadians));
+  return [
+    { x: -halfWidth, y: halfHeight },
+    { x: halfWidth, y: halfHeight },
+    { x: halfWidth, y: -halfHeight },
+    { x: -halfWidth, y: -halfHeight }
+  ].map((point) => applyToPoint27(rectToPcbTransform, point));
 }, getLayerRefFromGerberLayerName = (glayer_name) => {
   if (glayer_name.startsWith("F_"))
     return "top";
@@ -58592,9 +58658,9 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   const w = width / 2;
   const h = height / 2;
   const r = Math.max(0, Math.min(corner_radius ?? 0, Math.abs(w), Math.abs(h)));
-  let transformMatrix = translate22(center.x, center.y);
+  let transformMatrix = translate32(center.x, center.y);
   if (rotation) {
-    transformMatrix = compose22(transformMatrix, rotate22(rotation * Math.PI / 180));
+    transformMatrix = compose32(transformMatrix, rotate32(rotation * Math.PI / 180));
   }
   if (r === 0) {
     return [
@@ -58602,7 +58668,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       { x: w, y: h },
       { x: w, y: -h },
       { x: -w, y: -h }
-    ].map((point) => applyToPoint27(transformMatrix, point));
+    ].map((point) => applyToPoint32(transformMatrix, point));
   }
   const points = [];
   const corners = [
@@ -58621,7 +58687,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       });
     }
   }
-  return points.map((point) => applyToPoint27(transformMatrix, point));
+  return points.map((point) => applyToPoint32(transformMatrix, point));
 }, getCircleCutoutOutlinePolygon = (cutout) => {
   const points = [];
   for (let i = 0;i < circleCutoutPolygonSegmentCount2; i++) {
@@ -58713,9 +58779,9 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   const r = Math.max(0, Math.min(cr, Math.abs(w), Math.abs(h)));
   let rotationTransform = identity22();
   if (rotation) {
-    rotationTransform = rotate32(rotation * Math.PI / 180);
+    rotationTransform = rotate42(rotation * Math.PI / 180);
   }
-  const transformMatrix = compose32(translate32(center.x, center.y), rotationTransform);
+  const transformMatrix = compose42(translate42(center.x, center.y), rotationTransform);
   if (r > 0) {
     emitRoundedRect({ w, h, r, transformMatrix, builder, mfy, drawCw });
   } else {
@@ -58744,7 +58810,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   if (shouldReverse) {
     pts = [...cwPoints].reverse();
   }
-  const tpts = pts.map((p) => applyToPoint32(transformMatrix, p));
+  const tpts = pts.map((p) => applyToPoint42(transformMatrix, p));
   builder.add("move_operation", { x: tpts[0].x, y: mfy(tpts[0].y) });
   for (let i = 1;i < tpts.length; i++) {
     builder.add("plot_operation", { x: tpts[i].x, y: mfy(tpts[i].y) });
@@ -58770,13 +58836,13 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   }
   let currentPoint;
   const addLine = (pt) => {
-    const tpt = applyToPoint32(transformMatrix, pt);
+    const tpt = applyToPoint42(transformMatrix, pt);
     builder.add("plot_operation", { x: tpt.x, y: mfy(tpt.y) });
     currentPoint = tpt;
   };
   const addArc = (endPt, centerPt) => {
-    const tEnd = applyToPoint32(transformMatrix, endPt);
-    const tCenter = applyToPoint32(transformMatrix, centerPt);
+    const tEnd = applyToPoint42(transformMatrix, endPt);
+    const tCenter = applyToPoint42(transformMatrix, centerPt);
     builder.add(arcMode, {}).add("plot_operation", {
       x: tEnd.x,
       y: mfy(tEnd.y),
@@ -58809,7 +58875,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       }
     ];
     const startPt = { x: -w + r, y: h };
-    const tStart = applyToPoint32(transformMatrix, startPt);
+    const tStart = applyToPoint42(transformMatrix, startPt);
     builder.add("move_operation", { x: tStart.x, y: mfy(tStart.y) });
     currentPoint = tStart;
     for (const seg of cwSegments) {
@@ -58818,7 +58884,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     }
   } else {
     const startPt = { x: w - r, y: h };
-    const tStart = applyToPoint32(transformMatrix, startPt);
+    const tStart = applyToPoint42(transformMatrix, startPt);
     builder.add("move_operation", { x: tStart.x, y: mfy(tStart.y) });
     currentPoint = tStart;
     addLine({ x: -w + r, y: h });
@@ -58853,22 +58919,6 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     builder.add("plot_operation", { x: ordered[i].x, y: mfy(ordered[i].y) });
   }
   builder.add("plot_operation", { x: ordered[0].x, y: mfy(ordered[0].y) });
-}, getRotatedRectPoints = ({
-  center,
-  width,
-  height,
-  ccwRotationDegrees
-}) => {
-  const halfWidth = width / 2;
-  const halfHeight = height / 2;
-  const ccwRotationRadians = ccwRotationDegrees * Math.PI / 180;
-  const rectToPcbTransform = compose42(translate42(center.x, center.y), rotate42(ccwRotationRadians));
-  return [
-    { x: -halfWidth, y: halfHeight },
-    { x: halfWidth, y: halfHeight },
-    { x: halfWidth, y: -halfHeight },
-    { x: -halfWidth, y: -halfHeight }
-  ].map((point) => applyToPoint42(rectToPcbTransform, point));
 }, getEllipsePoints = ({
   x,
   y,
@@ -58926,7 +58976,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     throw new Error(`Expected inner layer, got ${layerRef}`);
   }
   return `In${layerRef.replace("inner", "")}_Cu`;
-}, convertSoupToGerberCommands = (circuitJson, opts = {}) => {
+}, convertCircuitJsonToGerberCommands = (circuitJson, opts = {}) => {
   opts.flip_y_axis ??= false;
   const hasPanel = circuitJson.some((e) => e.type === "pcb_panel");
   const hasBoard = circuitJson.some((e) => e.type === "pcb_board");
@@ -59416,6 +59466,8 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
               }
               if (!bPoint)
                 continue;
+              if (a.x === bPoint.x && a.y === bPoint.y)
+                continue;
               const glayer = glayers[getGerberLayerName(layer, "copper")];
               glayer.push(...gerberBuilder().add("select_aperture", {
                 aperture_number: findApertureNumber(glayer, {
@@ -59425,6 +59477,8 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
             }
           } else if (a.route_type === "via" && b.route_type === "wire") {
             if (b.layer === layer) {
+              if (a.x === b.x && a.y === b.y)
+                continue;
               const glayer = glayers[getGerberLayerName(layer, "copper")];
               glayer.push(...gerberBuilder().add("select_aperture", {
                 aperture_number: findApertureNumber(glayer, {
@@ -59853,15 +59907,29 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
                   ...element.shape !== "circle" ? { outer_width: padW, outer_height: padH } : {}
                 });
               }
-              const rotation = "rect_ccw_rotation" in element && typeof element.rect_ccw_rotation === "number" && Math.abs(padW - padH) > 0.000000001 ? element.rect_ccw_rotation : undefined;
+              const rectRotation = "rect_ccw_rotation" in element && typeof element.rect_ccw_rotation === "number" ? element.rect_ccw_rotation : undefined;
+              const renderAsRotatedRectRegion = rectRotation !== undefined && isGeometryChangingRectRotation({
+                width: aperturePadW,
+                height: aperturePadH,
+                ccwRotationDegrees: rectRotation
+              });
+              if (renderAsRotatedRectRegion) {
+                addClosedRegionFromPoints({
+                  target: glayer,
+                  apertureSource: glayer,
+                  points: getRotatedRectPoints({
+                    center: { x: element.x, y: element.y },
+                    width: aperturePadW,
+                    height: aperturePadH,
+                    ccwRotationDegrees: rectRotation
+                  })
+                });
+                continue;
+              }
               const gb = gerberBuilder().add("select_aperture", {
                 aperture_number: findApertureNumber(glayer, apertureConfig)
               });
-              if (rotation)
-                gb.add("load_rotation", { rotation_degrees: rotation });
               gb.add("flash_operation", { x: element.x, y: mfy(element.y) });
-              if (rotation)
-                gb.add("load_rotation", { rotation_degrees: 0 });
               glayer.push(...gb.build());
             }
           }
@@ -60030,13 +60098,13 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     glayers[key].push(...gerberBuilder().add("end_of_file", {}).build());
   }
   return glayers;
-}, convertCircuitJsonToGerberFiles = (circuitJson, options = {}) => {
+}, convertSoupToGerberCommands, convertCircuitJsonToGerberFiles = (circuitJson, options = {}) => {
   const { flip_y_axis = false } = options;
-  const gerberCommandLayers = convertSoupToGerberCommands(circuitJson, {
+  const gerberCommandLayers = convertCircuitJsonToGerberCommands(circuitJson, {
     flip_y_axis
   });
   const gerberFiles = Object.fromEntries(Object.entries(stringifyGerberCommandLayers(gerberCommandLayers)).map(([layerName, contents]) => [`${layerName}.gbr`, contents]));
-  const drillCommandLayers = convertSoupToExcellonDrillCommandLayers({
+  const drillCommandLayers = convertCircuitJsonToExcellonDrillCommandLayers({
     circuitJson,
     flip_y_axis
   });
@@ -60046,7 +60114,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   ]));
   return { ...gerberFiles, ...drillFiles };
 };
-var init_chunk_X27MJBIZ = __esm(() => {
+var init_chunk_WLO6XF2E = __esm(() => {
   import_polygon_clipping2 = __toESM3(require_polygon_clipping_cjs(), 1);
   import_fast_json_stable_stringify = __toESM3(require_fast_json_stable_stringify(), 1);
   import_polygon_clipping3 = __toESM3(require_polygon_clipping_cjs(), 1);
@@ -60661,7 +60729,7 @@ ${template_code}%`;
   };
   package_default5 = {
     name: "circuit-json-to-gerber",
-    version: "0.0.96",
+    version: "0.0.104",
     repository: {
       type: "git",
       url: "https://github.com/tscircuit/circuit-json-to-gerber"
@@ -60740,11 +60808,12 @@ ${template_code}%`;
     paste: "Paste"
   };
   outerLayerRefs = ["top", "bottom"];
+  convertSoupToGerberCommands = convertCircuitJsonToGerberCommands;
 });
 
 // node_modules/circuit-json-to-gerber/dist/index.js
 var init_dist = __esm(() => {
-  init_chunk_X27MJBIZ();
+  init_chunk_WLO6XF2E();
 });
 
 // node_modules/@tracespace/xml-id/index.js
@@ -153224,7 +153293,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.54",
-    "circuit-json-to-gerber": "^0.0.97",
+    "circuit-json-to-gerber": "^0.0.105",
     "circuit-json-to-kicad": "0.0.181",
     "circuit-json-to-pnp-csv": "^0.0.13",
     "circuit-json-to-readable-netlist": "^0.0.15",

package/dist/lib/index.js

@@ -69159,7 +69159,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.54",
-    "circuit-json-to-gerber": "^0.0.97",
+    "circuit-json-to-gerber": "^0.0.105",
     "circuit-json-to-kicad": "0.0.181",
     "circuit-json-to-pnp-csv": "^0.0.13",
     "circuit-json-to-readable-netlist": "^0.0.15",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2037",
+  "version": "0.1.2038",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -47,7 +47,7 @@
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.54",
-    "circuit-json-to-gerber": "^0.0.97",
+    "circuit-json-to-gerber": "^0.0.105",
     "circuit-json-to-kicad": "0.0.181",
     "circuit-json-to-pnp-csv": "^0.0.13",
     "circuit-json-to-readable-netlist": "^0.0.15",