feat: Implement rectangular and polygonal copper pours (#53)

* feat: Implement rectangular and polygonal copper pours

* fix regression

* ghost code

* naming

Author: ShiboSoftwareDev

package.json

@@ -16,23 +16,22 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
-    "@tscircuit/core": "^0.0.580",
     "@types/archiver": "^6.0.3",
     "@types/bun": "^1.1.8",
     "@types/node": "^22.5.2",
-    "@types/react": "^18.3.12",
     "archiver": "^7.0.1",
-    "bun-match-svg": "^0.0.3",
+    "react": "^19.1.0",
+    "@types/react": "^19.1.8",
+    "bun-match-svg": "^0.0.13",
     "commander": "^12.1.0",
     "gerber-to-svg": "^4.2.8",
     "pcb-stackup": "^4.2.8",
-    "react": "^18.3.1",
     "tsup": "^8.2.4",
-    "circuit-json": "^0.0.220"
+    "tscircuit": "^0.0.622"
   },
   "peerDependencies": {
     "typescript": "^5.0.0",
-    "circuit-json": "*"
+    "tscircuit": "*"
   },
   "dependencies": {
     "@tscircuit/alphabet": "^0.0.2",

src/gerber/any_gerber_command.ts

@@ -45,8 +45,7 @@ export const gerber_command_map = {
   end_of_file,
   move_operation,
   flash_operation,
-  // end_region_statement,
-  // flash_operation,
+  end_region_statement,
   format_specification,
   // load_mirroring,
   // load_polarity,
@@ -62,7 +61,7 @@ export const gerber_command_map = {
   select_aperture,
   set_unit,
   set_layer_polarity,
-  // start_region_statement,
+  start_region_statement,
   // step_and_repeat,
 } as const satisfies Record<string, GerberCommandDef<any, any>>
 

src/gerber/commands/end_region_statement.ts

@@ -1,10 +1,16 @@
 import { z } from "zod"
+import { defineGerberCommand } from "../define-gerber-command"
 
-export const end_region_statement = z
-  .object({
-    command_code: z.literal("G37"),
-    statement: z.string(),
-  })
-  .describe("End region statement: Ends the region statement")
+export const end_region_statement = defineGerberCommand({
+  command_code: "G37",
+  schema: z
+    .object({
+      command_code: z.literal("G37").default("G37"),
+    })
+    .describe("End region statement: Ends the region statement"),
+  stringify() {
+    return "G37*"
+  },
+})
 
-export type EndRegionStatement = z.infer<typeof end_region_statement>
+export type EndRegionStatement = z.infer<typeof end_region_statement.schema>

src/gerber/commands/start_region_statement.ts

@@ -1,12 +1,18 @@
 import { z } from "zod"
+import { defineGerberCommand } from "../define-gerber-command"
 
-export const start_region_statement = z
-  .object({
-    command_code: z.literal("G36"),
-    statement: z.string(),
-  })
-  .describe(
-    "Start region statement: Starts a region statement which creates a region by defining its contours.",
-  )
+export const start_region_statement = defineGerberCommand({
+  command_code: "G36",
+  schema: z
+    .object({
+      command_code: z.literal("G36").default("G36"),
+    })
+    .describe(
+      "Start region statement: Starts a region statement which creates a region by defining its contours.",
+    ),
+  stringify() {
+    return "G36*"
+  },
+})
 
-export type StartRegionStatement = z.infer<typeof start_region_statement>
+export type StartRegionStatement = z.infer<typeof start_region_statement.schema>

src/gerber/convert-soup-to-gerber-commands/getCommandHeaders.ts

@@ -87,6 +87,9 @@ export const getCommandHeaders = (opts: {
         comment: `Created by tscircuit (builder) date ${new Date().toISOString()}`,
       })
       .add("set_movement_mode_to_linear", {})
+      .add("set_layer_polarity", {
+        polarity: "D",
+      })
       .build()
   )
 }

src/gerber/convert-soup-to-gerber-commands/index.ts

@@ -637,6 +637,79 @@ export const convertSoupToGerberCommands = (
           }
           ec_layer.push(...cutout_builder.build())
         }
+      } else if (
+        element.type === "pcb_copper_pour" &&
+        layer === element.layer
+      ) {
+        const glayer = glayers[getGerberLayerName(layer, "copper")]
+
+        const pour_builder = gerberBuilder()
+          .add("select_aperture", { aperture_number: 10 })
+          .add("start_region_statement", {})
+
+        if (element.shape === "rect") {
+          const { center, width, height, rotation } = element
+          const w = (width as number) / 2
+          const h = (height as number) / 2
+
+          const points = [
+            { x: -w, y: h }, // Top-left
+            { x: w, y: h }, // Top-right
+            { x: w, y: -h }, // Bottom-right
+            { x: -w, y: -h }, // Bottom-left
+          ]
+
+          let transformMatrix = identity()
+          if (rotation) {
+            const angle_rad = ((rotation as number) * Math.PI) / 180
+            transformMatrix = rotate(angle_rad)
+          }
+          transformMatrix = compose(
+            translate(center.x, center.y),
+            transformMatrix,
+          )
+
+          const transformedPoints = points.map((p) =>
+            applyToPoint(transformMatrix, p),
+          )
+
+          pour_builder.add("move_operation", {
+            x: transformedPoints[0].x,
+            y: mfy(transformedPoints[0].y),
+          })
+          for (let i = 1; i < transformedPoints.length; i++) {
+            pour_builder.add("plot_operation", {
+              x: transformedPoints[i].x,
+              y: mfy(transformedPoints[i].y),
+            })
+          }
+          pour_builder.add("plot_operation", {
+            x: transformedPoints[0].x,
+            y: mfy(transformedPoints[0].y),
+          })
+        } else if (element.shape === "polygon") {
+          const { points } = element as any
+          if (points.length > 0) {
+            pour_builder.add("move_operation", {
+              x: points[0].x,
+              y: mfy(points[0].y),
+            })
+            for (let i = 1; i < points.length; i++) {
+              pour_builder.add("plot_operation", {
+                x: points[i].x,
+                y: mfy(points[i].y),
+              })
+            }
+            pour_builder.add("plot_operation", {
+              x: points[0].x,
+              y: mfy(points[0].y),
+            })
+          }
+        }
+
+        pour_builder.add("end_region_statement", {})
+
+        glayer.push(...pour_builder.build())
       }
     }
   }