Import EasyEDA courtyard (layer 12) as pcb_courtyard_outline and update snapshots

lib/convert-easyeda-json-to-tscircuit-soup-json.ts

@@ -19,6 +19,7 @@ import {
   any_source_component,
   pcb_smtpad,
   pcb_silkscreen_path,
+  pcb_courtyard_outline,
   pcb_plated_hole,
   pcb_hole,
   pcb_via,
@@ -116,6 +117,23 @@ const handleSilkscreenPath = (
   })
 }
 
+const handleCourtyardPath = (
+  track: z.infer<typeof TrackSchema>,
+  index: number,
+) => {
+  return pcb_courtyard_outline.parse({
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: `pcb_courtyard_outline_${index + 1}`,
+    pcb_component_id: "pcb_component_1",
+    layer: "top",
+    outline: track.points.map((point) => ({
+      x: milx10(point.x),
+      y: milx10(point.y),
+    })),
+    stroke_width: mil10ToMm(track.width),
+  })
+}
+
 const handleSilkscreenArc = (arc: z.infer<typeof ArcSchema>, index: number) => {
   const arcPath = generateArcFromSweep(
     arc.start.x,
@@ -140,6 +158,30 @@ const handleSilkscreenArc = (arc: z.infer<typeof ArcSchema>, index: number) => {
   } as Soup.PcbSilkscreenPathInput)
 }
 
+const handleCourtyardArc = (arc: z.infer<typeof ArcSchema>, index: number) => {
+  const arcPath = generateArcFromSweep(
+    arc.start.x,
+    arc.start.y,
+    arc.end.x,
+    arc.end.y,
+    arc.radiusX,
+    arc.largeArc,
+    arc.sweepDirection === "CW",
+  )
+
+  return pcb_courtyard_outline.parse({
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: `pcb_courtyard_arc_${index + 1}`,
+    pcb_component_id: "pcb_component_1",
+    layer: "top",
+    outline: arcPath.map((p) => ({
+      x: milx10(p.x),
+      y: milx10(p.y),
+    })),
+    stroke_width: mil10ToMm(arc.width),
+  })
+}
+
 const handleHole = (hole: z.infer<typeof HoleSchema>, index: number) => {
   return pcb_hole.parse({
     type: "pcb_hole",
@@ -461,9 +503,17 @@ export const convertEasyEdaJsonToCircuitJson = (
   // Add silkscreen paths, arcs and text
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
-      circuitElements.push(handleSilkscreenPath(shape, index))
+      if (shape.layer === 12) {
+        circuitElements.push(handleCourtyardPath(shape, index))
+      } else {
+        circuitElements.push(handleSilkscreenPath(shape, index))
+      }
     } else if (shape.type === "ARC") {
-      circuitElements.push(handleSilkscreenArc(shape, index))
+      if (shape.layer === 12) {
+        circuitElements.push(handleCourtyardArc(shape, index))
+      } else {
+        circuitElements.push(handleSilkscreenArc(shape, index))
+      }
     } else if (shape.type === "TEXT") {
       circuitElements.push(
         Soup.pcb_silkscreen_text.parse({
@@ -495,6 +545,7 @@ export const convertEasyEdaJsonToCircuitJson = (
       e.type === "pcb_hole" ||
       e.type === "pcb_via" ||
       e.type === "pcb_silkscreen_path" ||
+      e.type === "pcb_courtyard_outline" ||
       e.type === "pcb_silkscreen_text",
   )
 

tests/convert-to-soup-tests/c14877-courtyard.test.ts

@@ -0,0 +1,19 @@
+import { expect, test } from "bun:test"
+import c14877 from "tests/assets/C14877.raweasy.json"
+import { convertEasyEdaJsonToCircuitJson, EasyEdaJsonSchema } from "lib/index"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+
+test("C14877 imports courtyard geometry", () => {
+  const circuitJson = convertEasyEdaJsonToCircuitJson(
+    EasyEdaJsonSchema.parse(c14877),
+  )
+
+  const courtyardOutlines = circuitJson.filter(
+    (element) => element.type === "pcb_courtyard_outline",
+  )
+
+  expect(courtyardOutlines.length).toBeGreaterThan(0)
+  expect(convertCircuitJsonToPcbSvg(circuitJson)).toMatchSvgSnapshot(
+    import.meta.path,
+  )
+})