circuit-json-to-lbrn 0.0.1 → 0.0.2

package/lib/element-handlers/addSmtPad/addRectSmtPad.ts

@@ -1,37 +1,26 @@
+import { Box } from "@flatten-js/core"
 import type { ConvertContext } from "../../ConvertContext"
 import type { PcbSmtPadRect } from "circuit-json"
 import { ShapePath } from "lbrnts"
 
 export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
-  const { project, copperCutSetting } = ctx
+  const { project, copperCutSetting, connMap, netGeoms, origin } = ctx
 
-  const centerX = smtPad.x
-  const centerY = smtPad.y
+  const centerX = smtPad.x + origin.x
+  const centerY = smtPad.y + origin.y
   const halfWidth = smtPad.width / 2
   const halfHeight = smtPad.height / 2
 
-  // Create vertices for rectangle corners (clockwise from top-left)
-  const verts = [
-    { x: centerX - halfWidth, y: centerY - halfHeight }, // Top-left
-    { x: centerX + halfWidth, y: centerY - halfHeight }, // Top-right
-    { x: centerX + halfWidth, y: centerY + halfHeight }, // Bottom-right
-    { x: centerX - halfWidth, y: centerY + halfHeight }, // Bottom-left
-  ]
+  const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)!
 
-  // Create primitives (all lines)
-  const prims = [
-    { type: 0 }, // LineTo for top-right
-    { type: 0 }, // LineTo for bottom-right
-    { type: 0 }, // LineTo for bottom-left
-    { type: 0 }, // LineTo back to top-left (closing)
-  ]
-
-  project.children.push(
-    new ShapePath({
-      cutIndex: copperCutSetting.index,
-      verts,
-      prims,
-      isClosed: true,
-    }),
-  )
+  ctx.netGeoms
+    .get(netId)
+    ?.push(
+      new Box(
+        centerX - halfWidth,
+        centerY - halfHeight,
+        centerX + halfWidth,
+        centerY + halfHeight,
+      ),
+    )
 }

package/lib/index.ts

@@ -1,13 +1,21 @@
 import type { CircuitJson } from "circuit-json"
-import { LightBurnProject, CutSetting } from "lbrnts"
+import { LightBurnProject, CutSetting, ShapePath } from "lbrnts"
 import { cju } from "@tscircuit/circuit-json-util"
 import type { ConvertContext } from "./ConvertContext"
 import { addPlatedHole } from "./element-handlers/addPlatedHole"
 import { addSmtPad } from "./element-handlers/addSmtPad"
+import { addPcbTrace } from "./element-handlers/addPcbTrace"
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
+import { Polygon, Box, BooleanOperations } from "@flatten-js/core"
+import { polygonToShapePathData } from "./polygon-to-shape-path"
+// import { writeDebugSvg } from "./writeDebugSvg"
 
 export const convertCircuitJsonToLbrn = (
   circuitJson: CircuitJson,
-  options: { includeSilkscreen?: boolean } = {},
+  options: {
+    includeSilkscreen?: boolean
+    origin?: { x: number; y: number }
+  } = {},
 ): LightBurnProject => {
   const db = cju(circuitJson)
   const project = new LightBurnProject({
@@ -23,19 +31,98 @@ export const convertCircuitJsonToLbrn = (
   })
   project.children.push(copperCutSetting)
 
+  const connMap = getFullConnectivityMapFromCircuitJson(circuitJson)
+
   const ctx: ConvertContext = {
     db,
     project,
     copperCutSetting,
+    connMap,
+    netGeoms: new Map(),
+    origin: options.origin ?? { x: 0, y: 0 },
+  }
+
+  for (const net of Object.keys(connMap.netMap)) {
+    ctx.netGeoms.set(net, [])
   }
 
   for (const smtpad of db.pcb_smtpad.list()) {
     addSmtPad(smtpad, ctx)
   }
 
-  for (const platedHole of db.pcb_plated_hole.list()) {
-    addPlatedHole(platedHole, ctx)
+  // for (const platedHole of db.pcb_plated_hole.list()) {
+  //   addPlatedHole(platedHole, ctx)
+  // }
+
+  for (const trace of db.pcb_trace.list()) {
+    addPcbTrace(trace, ctx)
   }
 
+  // Draw each individual shape geometry as a ShapePath
+  // FOR DEBUGGING!!!
+  // for (const net of Object.keys(connMap.netMap)) {
+  //   const netGeoms = ctx.netGeoms.get(net)!
+
+  //   if (netGeoms.length === 0) {
+  //     continue
+  //   }
+
+  //   for (const geom of netGeoms) {
+  //     // Convert Box to Polygon if needed
+  //     const polygon = geom instanceof Box ? new Polygon(geom) : geom
+
+  //     // Convert the polygon to verts and prims
+  //     const { verts, prims } = polygonToShapePathData(polygon)
+
+  //     project.children.push(
+  //       new ShapePath({
+  //         cutIndex: copperCutSetting.index,
+  //         verts,
+  //         prims,
+  //         isClosed: false,
+  //       }),
+  //     )
+  //   }
+  // }
+
+  // Create a union of all the net geoms, and add to project
+  for (const net of Object.keys(connMap.netMap)) {
+    const netGeoms = ctx.netGeoms.get(net)!
+
+    if (netGeoms.length === 0) {
+      continue
+    }
+
+    let union = netGeoms[0]!
+    if (union instanceof Box) {
+      union = new Polygon(union)
+    }
+    for (const geom of netGeoms.slice(1)) {
+      if (geom instanceof Polygon) {
+        union = BooleanOperations.unify(union, geom)
+      } else if (geom instanceof Box) {
+        union = BooleanOperations.unify(union, new Polygon(geom))
+      }
+    }
+
+    // DEBUGGING ONLY!!!
+    // if (netGeoms.length > 1) {
+    //   writeDebugSvg(net, union)
+    // }
+
+    for (const island of union.splitToIslands()) {
+      // Convert the polygon to verts and prims
+      const { verts, prims } = polygonToShapePathData(island)
+
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts,
+          prims,
+          isClosed: false,
+        }),
+      )
+    }
+  }
   return project
 }

package/lib/polygon-to-shape-path.ts

@@ -0,0 +1,49 @@
+import type { Polygon } from "@flatten-js/core"
+
+export interface ShapePathData {
+  verts: Array<{ x: number; y: number }>
+  prims: Array<{ type: number }>
+}
+
+/**
+ * Converts a flattenjs Polygon to verts and prims arrays for use with ShapePath
+ * @param polygon The flattenjs Polygon to convert
+ * @returns Object containing verts and prims arrays
+ */
+export function polygonToShapePathData(polygon: Polygon): ShapePathData {
+  const verts: Array<{ x: number; y: number }> = []
+  const prims: Array<{ type: number }> = []
+
+  // Get SVG representation and extract path data
+  const svgString = polygon.svg()
+  const dAttributeMatch = svgString.match(/\bd="([^"]+)"/)
+
+  if (!dAttributeMatch || !dAttributeMatch[1]) {
+    return { verts, prims }
+  }
+
+  const pathData = dAttributeMatch[1].trim()
+
+  // Parse SVG path commands (M, L, z)
+  const commands = pathData.match(/[MLz][^MLz]*/g) || []
+
+  for (const command of commands) {
+    const type = command[0]
+    const coords = command.slice(1).trim()
+
+    if (type === "M" || type === "L") {
+      // Parse coordinates (format: "x,y")
+      const parts = coords.split(",")
+      const x = Number(parts[0])
+      const y = Number(parts[1])
+
+      if (!Number.isNaN(x) && !Number.isNaN(y)) {
+        verts.push({ x, y })
+        prims.push({ type: 0 }) // 0 = LineTo
+      }
+    }
+    // 'z' closes the path, no action needed
+  }
+
+  return { verts, prims }
+}

package/lib/writeDebugSvg.ts

@@ -0,0 +1,43 @@
+import { Polygon } from "@flatten-js/core"
+
+export const writeDebugSvg = (netName: string, polygon: Polygon) => {
+  // Calculate bounds from all points in the polygon
+  let minX = Infinity
+  let minY = Infinity
+  let maxX = -Infinity
+  let maxY = -Infinity
+
+  for (const face of polygon.faces) {
+    for (const edge of face.edges) {
+      const start = edge.start
+      const end = edge.end
+
+      minX = Math.min(minX, start.x, end.x)
+      minY = Math.min(minY, start.y, end.y)
+      maxX = Math.max(maxX, start.x, end.x)
+      maxY = Math.max(maxY, start.y, end.y)
+    }
+  }
+
+  // Calculate bounds with 15% margin
+  const width = maxX - minX
+  const height = maxY - minY
+  const margin = 0.15
+
+  const viewBoxX = minX - width * margin
+  const viewBoxY = minY - height * margin
+  const viewBoxWidth = width * (1 + 2 * margin)
+  const viewBoxHeight = height * (1 + 2 * margin)
+
+  // Calculate stroke width as 0.5% of max viewBox dimension
+  const maxDimension = Math.max(viewBoxWidth, viewBoxHeight)
+  const strokeWidth = maxDimension * 0.001
+
+  const svgContent = `<svg width="800" height="800" style="background-color: #ffffff;" viewBox="${viewBoxX} ${viewBoxY} ${viewBoxWidth} ${viewBoxHeight}" xmlns="http://www.w3.org/2000/svg">
+  <g stroke-width="${strokeWidth}">
+${polygon.svg()}
+  </g>
+</svg>`
+
+  Bun.write(`debug-output/${netName}.svg`, svgContent)
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --dts --format esm",
@@ -10,6 +10,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.6",
+    "@flatten-js/core": "^1.6.8",
+    "@flatten-js/polygon-offset": "^1.1.4",
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.14",
@@ -24,6 +26,6 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "lbrnts": "^0.0.1"
+    "lbrnts": "^0.0.6"
   }
 }