From 4af6a728077999afa1dd9efef8e88ea79b683f67 Mon Sep 17 00:00:00 2001
From: Rishabh Gupta <belikerishabh@gmail.com>
Date: Fri, 11 Oct 2024 02:16:09 +0530
Subject: [PATCH] test: test added for circle and rect

---
 .../primitive-components/SilkscreenCircle.ts  |  9 ++----
 .../primitive-components/SilkscreenRect.ts    | 11 ++-----
 .../silkscreen-rect-pcb.snap.svg              | 13 +++++++++
 .../silkscreen-rect.test.tsx                  | 29 +++++++++++++++++++
 4 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 tests/components/primitive-components/__snapshots__/silkscreen-rect-pcb.snap.svg
 create mode 100644 tests/components/primitive-components/silkscreen-rect.test.tsx

diff --git a/lib/components/primitive-components/SilkscreenCircle.ts b/lib/components/primitive-components/SilkscreenCircle.ts
index 8880d9d..af489c0 100644
--- a/lib/components/primitive-components/SilkscreenCircle.ts
+++ b/lib/components/primitive-components/SilkscreenCircle.ts
@@ -1,5 +1,4 @@
 import { silkscreenCircleProps } from "@tscircuit/props"
-import { applyToPoint } from "transformation-matrix"
 import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
 
 export class SilkscreenCircle extends PrimitiveComponent<
@@ -25,17 +24,13 @@ export class SilkscreenCircle extends PrimitiveComponent<
     }
 
     const transform = this._computePcbGlobalTransformBeforeLayout()
-    const transformedCenter = applyToPoint(transform, {
-      x: props.pcbX ?? 0,
-      y: props.pcbY ?? 0,
-    })
 
     const pcb_silkscreen_circle = db.pcb_silkscreen_circle.insert({
       pcb_component_id: this.parent?.pcb_component_id!,
       layer,
       center: {
-        x: transformedCenter.x,
-        y: transformedCenter.y,
+        x: props.pcbX ?? 0,
+        y: props.pcbY ?? 0,
       },
       radius: props.radius,
     })
diff --git a/lib/components/primitive-components/SilkscreenRect.ts b/lib/components/primitive-components/SilkscreenRect.ts
index 4dcc134..d2d7db4 100644
--- a/lib/components/primitive-components/SilkscreenRect.ts
+++ b/lib/components/primitive-components/SilkscreenRect.ts
@@ -1,5 +1,4 @@
 import { silkscreenRectProps } from "@tscircuit/props"
-import { applyToPoint } from "transformation-matrix"
 import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
 
 export class SilkscreenRect extends PrimitiveComponent<
@@ -25,18 +24,12 @@ export class SilkscreenRect extends PrimitiveComponent<
       )
     }
 
-    const transform = this._computePcbGlobalTransformBeforeLayout()
-    const transformedCenter = applyToPoint(transform, {
-      x: props.pcbX ?? 0,
-      y: props.pcbY ?? 0,
-    })
-
     const pcb_silkscreen_rect = db.pcb_silkscreen_rect.insert({
       pcb_component_id: this.parent?.pcb_component_id!,
       layer,
       center: {
-        x: transformedCenter.x,
-        y: transformedCenter.y,
+        x: props.pcbX ?? 0,
+        y: props.pcbY ?? 0,
       },
       width: props.width,
       height: props.height,
diff --git a/tests/components/primitive-components/__snapshots__/silkscreen-rect-pcb.snap.svg b/tests/components/primitive-components/__snapshots__/silkscreen-rect-pcb.snap.svg
new file mode 100644
index 0000000..c5542f8
--- /dev/null
+++ b/tests/components/primitive-components/__snapshots__/silkscreen-rect-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="150" y="50" width="500" height="500"/><path class="pcb-board" d="M 150 550 L 650 550 L 650 50 L 150 50 Z" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5"/></svg>
\ No newline at end of file
diff --git a/tests/components/primitive-components/silkscreen-rect.test.tsx b/tests/components/primitive-components/silkscreen-rect.test.tsx
new file mode 100644
index 0000000..adb719d
--- /dev/null
+++ b/tests/components/primitive-components/silkscreen-rect.test.tsx
@@ -0,0 +1,29 @@
+import { expect, test } from "bun:test";
+import { getTestFixture } from "tests/fixtures/get-test-fixture";
+
+test("SilkscreenRect rendering", () => {
+  const { project } = getTestFixture();
+  project.add(
+    <board width="10mm" height="10mm">
+      <silkscreenrect
+        pcbX={2}
+        pcbY={3}
+        width={"2mm"}
+        height={"1.5mm"}
+        layer="bottom"
+      />
+    </board>
+  );
+  project.render();
+
+  const silkscreenRects = project.db.pcb_silkscreen_rect.list();
+
+  expect(silkscreenRects.length).toBe(1);
+  expect(silkscreenRects[0].center.x).toBe(2);
+  expect(silkscreenRects[0].center.y).toBe(3);
+  expect(silkscreenRects[0].width).toBe(2);
+  expect(silkscreenRects[0].height).toBe(1.5);
+  expect(silkscreenRects[0].layer).toBe("bottom");
+
+  expect(project).toMatchPcbSnapshot(import.meta.path);
+});