From c30464216f5ac56546872d9a7185739393f2924d Mon Sep 17 00:00:00 2001
From: seveibar <seveibar@gmail.com>
Date: Mon, 14 Oct 2024 21:21:40 -0700
Subject: [PATCH] trace layer fix for explicitly defined smtpads

---
 .../base-components/PrimitiveComponent.ts     |  2 +-
 .../chip-layer-trace-bug-pcb.snap.svg         | 13 ++++
 .../chip-layer-trace-bug.test.tsx             | 69 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 tests/components/normal-components/__snapshots__/chip-layer-trace-bug-pcb.snap.svg
 create mode 100644 tests/components/normal-components/chip-layer-trace-bug.test.tsx

diff --git a/lib/components/base-components/PrimitiveComponent.ts b/lib/components/base-components/PrimitiveComponent.ts
index 5dee3f9..55bf000 100644
--- a/lib/components/base-components/PrimitiveComponent.ts
+++ b/lib/components/base-components/PrimitiveComponent.ts
@@ -479,7 +479,7 @@ export abstract class PrimitiveComponent<
   getAvailablePcbLayers(): string[] {
     if (this.isPcbPrimitive) {
       const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers()
-      if ("layer" in this._parsedProps) {
+      if ("layer" in this._parsedProps || this.componentName === "SmtPad") {
         const layer = maybeFlipLayer(this._parsedProps.layer ?? "top")
         return [layer]
       }
diff --git a/tests/components/normal-components/__snapshots__/chip-layer-trace-bug-pcb.snap.svg b/tests/components/normal-components/__snapshots__/chip-layer-trace-bug-pcb.snap.svg
new file mode 100644
index 0000000..7d9dd42
--- /dev/null
+++ b/tests/components/normal-components/__snapshots__/chip-layer-trace-bug-pcb.snap.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600"><style>
+              .boundary { fill: #000; }
+              .pcb-board { fill: none; }
+              .pcb-trace { fill: none; }
+              .pcb-hole-outer { fill: rgb(200, 52, 52); }
+              .pcb-hole-inner { fill: rgb(255, 38, 226); }
+              .pcb-pad { }
+              .pcb-boundary { fill: none; stroke: #fff; stroke-width: 0.3; }
+              .pcb-silkscreen { fill: none; }
+              .pcb-silkscreen-top { stroke: #f2eda1; }
+              .pcb-silkscreen-bottom { stroke: #f2eda1; }
+              .pcb-silkscreen-text { fill: #f2eda1; }
+            </style><rect class="boundary" x="0" y="0" width="800" height="600"/><rect class="pcb-boundary" x="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275"/><g transform="translate(400, 300) rotate(0) scale(1, -1)"><rect class="pcb-component" x="-68.18181818181819" y="-13.636363636363637" width="136.36363636363637" height="27.272727272727273"/><rect class="pcb-component-outline" x="-68.18181818181819" y="-13.636363636363637" width="136.36363636363637" height="27.272727272727273"/></g><g transform="translate(400, 300) rotate(0) scale(1, -1)"><rect class="pcb-component" x="0" y="0" width="0" height="0"/><rect class="pcb-component-outline" x="0" y="0" width="0" height="0"/></g><g transform="translate(263.6363636363636, 300) rotate(0) scale(1, -1)"><rect class="pcb-component" x="-21.818181818181813" y="-8.181818181818183" width="43.636363636363626" height="16.363636363636367"/><rect class="pcb-component-outline" x="-21.818181818181813" y="-8.181818181818183" width="43.636363636363626" height="16.363636363636367"/></g><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="440.90909090909093" y="286.3636363636364" width="27.272727272727273" height="27.272727272727273"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="331.8181818181818" y="286.3636363636364" width="27.272727272727273" height="27.272727272727273"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="241.8181818181818" y="291.8181818181818" width="16.363636363636367" height="16.363636363636367"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="269.09090909090907" y="291.8181818181818" width="16.363636363636367" height="16.363636363636367"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" d="M 277.27272727272725 300 L 418.54545454545456 300" stroke-width="4.363636363636364" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" d="M 418.54545454545456 300 L 418.54545454545456 300" stroke-width="4.363636363636364" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" d="M 418.54545454545456 300 L 418.54545454545456 300" stroke-width="4.363636363636364" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" d="M 418.54545454545456 300 L 454.54545454545456 300" stroke-width="4.363636363636364" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges"/><g><circle class="pcb-hole-outer" cx="418.54545454545456" cy="300" r="8.181818181818182"/><circle class="pcb-hole-inner" cx="418.54545454545456" cy="300" r="4.090909090909091"/></g></svg>
\ No newline at end of file
diff --git a/tests/components/normal-components/chip-layer-trace-bug.test.tsx b/tests/components/normal-components/chip-layer-trace-bug.test.tsx
new file mode 100644
index 0000000..f09265d
--- /dev/null
+++ b/tests/components/normal-components/chip-layer-trace-bug.test.tsx
@@ -0,0 +1,69 @@
+import { test, expect } from "bun:test"
+import { getTestFixture } from "tests/fixtures/get-test-fixture"
+
+const FlippedChip = ({
+  name,
+  ...props
+}: { name: string; [key: string]: any }) => (
+  <group>
+    <chip {...props} name={name} layer="bottom" />
+  </group>
+)
+
+test("chip with flipped layer should have traces on correct layer", async () => {
+  const { circuit } = getTestFixture()
+
+  circuit.add(
+    <board width="20mm" height="20mm">
+      <FlippedChip
+        name="U1"
+        footprint={
+          <footprint>
+            <smtpad
+              shape="rect"
+              width="1mm"
+              height="1mm"
+              pcbX={-2}
+              pcbY={0}
+              portHints={["1"]}
+            />
+            <smtpad
+              shape="rect"
+              width="1mm"
+              height="1mm"
+              pcbX={2}
+              pcbY={0}
+              portHints={["2"]}
+            />
+          </footprint>
+        }
+        pcbX={0}
+        pcbY={0}
+      />
+      <resistor
+        name="R1"
+        resistance="10k"
+        footprint="0402"
+        pcbX={-5}
+        pcbY={0}
+      />
+      <trace from=".R1 > .pin2" to=".U1 > .1" />
+    </board>,
+  )
+
+  circuit.render()
+
+  const traces = circuit.db.pcb_trace.list()
+
+  const routeLayers = traces[0].route.flatMap((point) => {
+    if ("layer" in point) {
+      return [point.layer]
+    }
+    return [point.to_layer, point.from_layer]
+  })
+
+  expect(circuit).toMatchPcbSnapshot(import.meta.path)
+
+  expect(routeLayers).toContain("bottom")
+  expect(routeLayers).toContain("top")
+})