refactor: update files for cleaner structure

Author: masonlet

api/languages/index.js

@@ -1,6 +1,6 @@
 import { parseQueryParams } from '../../src/utils/params.js';
 import { fetchLanguageData, processLanguageData } from '../../src/api/github.js';
-import { generateChartData } from '../../src/charts/chart.js';
+import { generateChartData } from '../../src/render/chart.js';
 import { renderSvg } from '../../src/render/svg.js';
 import { renderError } from '../../src/render/error.js';
 

src/charts/donut.js

@@ -1,7 +1,5 @@
-import { createDonutSegments } from './geometry/donut.js';
-import {
-  DONUT_GEOMETRY
-} from '../constants/donut.js';
+import { createDonutSegments } from './geometry.js';
+import { DONUT_GEOMETRY } from '../constants/geometry.js';
 import { createLegend } from './legend.js';
 import {
   LEGEND_SHIFT_THRESHOLD,

src/charts/geometry/donut.js src/charts/geometry.jssrc/charts/geometry/donut.js renamed to src/charts/geometry.js

@@ -1,4 +1,4 @@
-import { FULL_CIRCLE_ANGLE } from './constants.js';
+import { FULL_CIRCLE_ANGLE } from '../constants/geometry.js';
 
 export const polarToCartesian = (cx, cy, r, angleDeg) => {
   const angleRad = (angleDeg - 90) * Math.PI / 180;
@@ -45,4 +45,4 @@ export const createDonutSegments = (languages, cx, geometry, colours) => {
     currentAngle += angle;
     return `<path d="${path}" fill="${colours[i]}"/>`;
   }).join('');
-}
+}

src/charts/geometry/constants.js

@@ -3,4 +3,6 @@ export const DONUT_GEOMETRY = {
   OUTER_RADIUS: 80,
   INNER_RADIUS: 50,
   MARGIN_RIGHT: 20
-}
+}
+
+export const FULL_CIRCLE_ANGLE = 359.9999;

src/constants/donut.js src/constants/geometry.jssrc/constants/donut.js renamed to src/constants/geometry.js

@@ -1,4 +1,4 @@
-import { generateDonutChart } from './donut.js';
+import { generateDonutChart } from '../charts/donut.js';
 
 const CHART_GENERATORS = {
   donut: generateDonutChart,

src/charts/chart.js src/render/chart.jssrc/charts/chart.js renamed to src/render/chart.js

@@ -2,13 +2,13 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import handler from "../../../api/languages/index.js";
 import { parseQueryParams } from "../../../src/utils/params.js";
 import { fetchLanguageData, processLanguageData } from "../../../src/api/github.js";
-import { generateChartData } from "../../../src/charts/chart.js";
+import { generateChartData } from "../../../src/render/chart.js";
 import { renderSvg } from "../../../src/render/svg.js";
 import { renderError } from "../../../src/render/error.js";
 
 vi.mock("../../../src/utils/params.js");
 vi.mock("../../../src/api/github.js");
-vi.mock("../../../src/charts/chart.js");
+vi.mock("../../../src/render/chart.js");
 vi.mock("../../../src/render/svg.js");
 vi.mock("../../../src/render/error.js");
 

tests/api/languages/index.test.js

@@ -1,10 +1,10 @@
 import { describe, it, expect, vi } from "vitest";
 import { generateDonutChart } from "../../src/charts/donut.js";
-import { createDonutSegments } from "../../src/charts/geometry/donut.js";
+import { createDonutSegments } from "../../src/charts/geometry.js";
 import { createLegend } from "../../src/charts/legend.js";
 import { LEGEND_SHIFT_THRESHOLD } from "../../src/constants/styles.js";
 
-vi.mock("../../src/charts/geometry/donut.js", () => ({
+vi.mock("../../src/charts/geometry.js", () => ({
   createDonutSegments: vi.fn(() => '<path d="mockSegment"/>')
 }));
 

tests/charts/donut.test.js

@@ -3,8 +3,7 @@ import {
   polarToCartesian,
   describeSegment,
   createDonutSegments
-} from "../../../src/charts/geometry/donut.js";
-import { FULL_CIRCLE_ANGLE } from "../../../src/charts/geometry/constants.js";
+} from "../../src/charts/geometry.js";
 
 const mockGeometry = { CENTER_Y: 100, INNER_RADIUS: 30, OUTER_RADIUS: 50 };
 

tests/charts/geometry/geometry.test.js tests/charts/geometry.test.jstests/charts/geometry/geometry.test.js renamed to tests/charts/geometry.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest";
-import { generateChartData } from "../../src/charts/chart.js";
+import { generateChartData } from "../../src/render/chart.js";
 import { generateDonutChart } from "../../src/charts/donut.js";
 
 vi.mock("../../src/charts/donut.js", () => ({