@gh-top-languages/lib 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +36 -33
  3. package/dist/charts/donut.d.ts +1 -1
  4. package/dist/charts/donut.d.ts.map +1 -1
  5. package/dist/charts/donut.js +5 -6
  6. package/dist/charts/donut.js.map +1 -1
  7. package/dist/charts/geometry.js +11 -11
  8. package/dist/charts/layout.d.ts +13 -2
  9. package/dist/charts/layout.d.ts.map +1 -1
  10. package/dist/charts/layout.js +27 -8
  11. package/dist/charts/layout.js.map +1 -1
  12. package/dist/charts/legend.d.ts +1 -1
  13. package/dist/charts/legend.d.ts.map +1 -1
  14. package/dist/charts/legend.js +20 -20
  15. package/dist/charts/legend.js.map +1 -1
  16. package/dist/charts/pie.d.ts +1 -1
  17. package/dist/charts/pie.d.ts.map +1 -1
  18. package/dist/charts/pie.js +5 -6
  19. package/dist/charts/pie.js.map +1 -1
  20. package/dist/constants/styles.d.ts +4 -2
  21. package/dist/constants/styles.d.ts.map +1 -1
  22. package/dist/constants/styles.js +18 -2
  23. package/dist/constants/styles.js.map +1 -1
  24. package/dist/render/chart.d.ts +1 -1
  25. package/dist/render/chart.d.ts.map +1 -1
  26. package/dist/render/chart.js +2 -2
  27. package/dist/render/chart.js.map +1 -1
  28. package/dist/render/error.js +7 -7
  29. package/dist/render/svg.d.ts +2 -1
  30. package/dist/render/svg.d.ts.map +1 -1
  31. package/dist/render/svg.js +21 -18
  32. package/dist/render/svg.js.map +1 -1
  33. package/dist/types.d.ts +2 -0
  34. package/dist/types.d.ts.map +1 -1
  35. package/package.json +48 -48
  36. package/src/charts/donut.ts +38 -22
  37. package/src/charts/geometry.ts +88 -88
  38. package/src/charts/layout.ts +50 -19
  39. package/src/charts/legend.ts +54 -53
  40. package/src/charts/pie.ts +41 -22
  41. package/src/constants/config.ts +11 -11
  42. package/src/constants/geometry.ts +9 -9
  43. package/src/constants/styles.ts +40 -23
  44. package/src/constants/themes.ts +68 -68
  45. package/src/constants/types.ts +4 -4
  46. package/src/render/chart.ts +22 -24
  47. package/src/render/error.ts +25 -25
  48. package/src/render/svg.ts +30 -31
  49. package/src/types.ts +30 -28
  50. package/src/utils/params.ts +47 -47
  51. package/src/utils/sanitize.ts +14 -14
package/LICENSE CHANGED
@@ -1,21 +1,21 @@
1
- MIT License
2
-
3
- Copyright (c) 2026 Mason L'Etoile
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in all
13
- copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
- SOFTWARE.
1
+ MIT License
2
+
3
+ Copyright (c) 2026 GitHub Top Languages, Mason L'Etoile
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.
package/README.md CHANGED
@@ -1,33 +1,36 @@
1
- # GitHub Top Languages Library
2
-
3
- Core library for github-top-languages projects — chart generation, SVG output, and parameter parsing
4
-
5
- ## Modules
6
-
7
- | Module | Description |
8
- | --- | --- |
9
- | `charts/donut.js` | Donut chart segment and legend generation |
10
- | `charts/pie.js` | Pie chart segment and legend generation |
11
- | `charts/geometry.js` | SVG arc path math and segment helpers |
12
- | `charts/legend.js` | Legend element generation |
13
- | `charts/layout.js` | Shared layout calculations |
14
- | `render/chart.js` | Chart type dispatcher |
15
- | `render/svg.js` | SVG document rendering |
16
- | `render/error.js` | Error SVG rendering |
17
- | `utils/params.js` | Query parameter parsing and normalization |
18
- | `utils/sanitize.js` | HTML entity sanitization |
19
- | `constants/config.js` | Default configuration values |
20
- | `constants/geometry.js` | Geometry constants |
21
- | `constants/styles.js` | Style and layout constants |
22
- | `constants/themes.js` | Built-in colour themes |
23
- | `constants/types.js` | Valid chart type values |
24
- | `types.js` | Shared TypeScript types |
25
-
26
- ## Installation
27
-
28
- ```bash
29
- npm install github-top-languages-lib
30
- ```
31
-
32
- ## License
33
- MIT License - see [LICENSE](./LICENSE) for details.
1
+ # GitHub Top Languages Library
2
+
3
+ Core library for github-top-languages projects — chart generation, SVG output, and parameter parsing
4
+
5
+ [![License: MIT](https://img.shields.io/badge/License-MIT-green)](./LICENSE)
6
+ [![lib](https://img.shields.io/npm/v/@gh-top-languages/lib)](https://www.npmjs.com/package/@gh-top-languages/lib)
7
+
8
+ ## Modules
9
+
10
+ | Module | Description |
11
+ | --- | --- |
12
+ | `charts/donut.js` | Donut chart segment and legend generation |
13
+ | `charts/pie.js` | Pie chart segment and legend generation |
14
+ | `charts/geometry.js` | SVG arc path math and segment helpers |
15
+ | `charts/legend.js` | Legend element generation |
16
+ | `charts/layout.js` | Shared layout calculations |
17
+ | `render/chart.js` | Chart type dispatcher |
18
+ | `render/svg.js` | SVG document rendering |
19
+ | `render/error.js` | Error SVG rendering |
20
+ | `utils/params.js` | Query parameter parsing and normalization |
21
+ | `utils/sanitize.js` | HTML entity sanitization |
22
+ | `constants/config.js` | Default configuration values |
23
+ | `constants/geometry.js` | Geometry constants |
24
+ | `constants/styles.js` | Style and layout constants |
25
+ | `constants/themes.js` | Built-in colour themes |
26
+ | `constants/types.js` | Valid chart type values |
27
+ | `types.js` | Shared TypeScript types |
28
+
29
+ ## Installation
30
+
31
+ ```bash
32
+ npm install @gh-top-languages/lib
33
+ ```
34
+
35
+ ## License
36
+ MIT License - see [LICENSE](./LICENSE) for details.
@@ -1,3 +1,3 @@
1
1
  import type { Language, Theme, ChartResult } from "../types.js";
2
- export declare function generateDonutChart(normalizedLanguages: Language[], selectedTheme: Theme, width: number, stroke: boolean): ChartResult;
2
+ export declare function generateDonutChart(normalizedLanguages: Language[], selectedTheme: Theme, stroke: boolean): ChartResult;
3
3
  //# sourceMappingURL=donut.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"donut.d.ts","sourceRoot":"","sources":["../../src/charts/donut.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAA2B,MAAM,aAAa,CAAC;AAMzF,wBAAgB,kBAAkB,CAChC,mBAAmB,EAAE,QAAQ,EAAE,EAC/B,aAAa,EAAQ,KAAK,EAC1B,KAAK,EAAgB,MAAM,EAC3B,MAAM,EAAe,OAAO,GAC3B,WAAW,CAUb"}
1
+ {"version":3,"file":"donut.d.ts","sourceRoot":"","sources":["../../src/charts/donut.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAMhE,wBAAgB,kBAAkB,CAChC,mBAAmB,EAAE,QAAQ,EAAE,EAC/B,aAAa,EAAQ,KAAK,EAC1B,MAAM,EAAe,OAAO,GAC3B,WAAW,CA2Bb"}
@@ -1,13 +1,12 @@
1
- import { resolveLayout, calculateChartCenter, calculateLegendStartX } from "./layout.js";
2
1
  import { DONUT_GEOMETRY } from "../constants/geometry.js";
3
2
  import { createDonutSegments } from "./geometry.js";
4
3
  import { createLegend } from "./legend.js";
5
- export function generateDonutChart(normalizedLanguages, selectedTheme, width, stroke) {
4
+ import { resolveLayout, computeLayout } from "./layout.js";
5
+ export function generateDonutChart(normalizedLanguages, selectedTheme, stroke) {
6
6
  const { isShifted, useStroke } = resolveLayout(normalizedLanguages.length, stroke);
7
- const chartX = calculateChartCenter(width, isShifted);
8
- const legendStartX = calculateLegendStartX(chartX, DONUT_GEOMETRY.OUTER_RADIUS);
7
+ const { chartX, legendStartX, columnWidth, contentWidth, contentHeight } = computeLayout(normalizedLanguages, isShifted, DONUT_GEOMETRY);
9
8
  const segments = createDonutSegments(normalizedLanguages, chartX, DONUT_GEOMETRY, [...selectedTheme.colours], useStroke);
10
- const legend = createLegend(normalizedLanguages, isShifted, selectedTheme, legendStartX, useStroke);
11
- return { segments, legend };
9
+ const legend = createLegend(normalizedLanguages, isShifted, selectedTheme, legendStartX, useStroke, columnWidth);
10
+ return { segments, legend, contentWidth, contentHeight };
12
11
  }
13
12
  //# sourceMappingURL=donut.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"donut.js","sourceRoot":"","sources":["../../src/charts/donut.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,cAAc,EAA8C,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAyC,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAgD,MAAM,aAAa,CAAC;AAEzF,MAAM,UAAU,kBAAkB,CAChC,mBAA+B,EAC/B,aAA0B,EAC1B,KAA2B,EAC3B,MAA4B;IAE5B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnF,MAAM,MAAM,GAAqB,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACxE,MAAM,YAAY,GAAe,qBAAqB,CAAC,MAAM,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAE5F,MAAM,QAAQ,GAAG,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IACzH,MAAM,MAAM,GAAK,YAAY,CAAC,mBAAmB,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAEtG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"donut.js","sourceRoot":"","sources":["../../src/charts/donut.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAqB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAgB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,YAAY,EAAuB,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAO,MAAM,aAAa,CAAC;AAEhE,MAAM,UAAU,kBAAkB,CAChC,mBAA+B,EAC/B,aAA0B,EAC1B,MAA4B;IAE5B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,EACJ,MAAM,EACN,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,aAAa,EACd,GAAG,aAAa,CAAC,mBAAmB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAG,mBAAmB,CAClC,mBAAmB,EACnB,MAAM,EACN,cAAc,EACd,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC1B,SAAS,CACV,CAAC;IACF,MAAM,MAAM,GAAG,YAAY,CACzB,mBAAmB,EACnB,SAAS,EACT,aAAa,EACb,YAAY,EACZ,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;AAC3D,CAAC"}
@@ -18,21 +18,21 @@ export const describeSegment = (cx, cy, innerR, outerR, startAngle, endAngle) =>
18
18
  const endOuter = polarToCartesian(cx, cy, outerR, startAngle);
19
19
  const largeArcFlag = endAngle - startAngle <= 180 ? '0' : '1';
20
20
  if (innerR === 0) {
21
- return `
22
- M ${cx} ${cy}
23
- L ${startOuter.x} ${startOuter.y}
24
- A ${outerR} ${outerR} 0 ${largeArcFlag} 0 ${endOuter.x} ${endOuter.y}
25
- Z
21
+ return `
22
+ M ${cx} ${cy}
23
+ L ${startOuter.x} ${startOuter.y}
24
+ A ${outerR} ${outerR} 0 ${largeArcFlag} 0 ${endOuter.x} ${endOuter.y}
25
+ Z
26
26
  `.trim();
27
27
  }
28
28
  const startInner = polarToCartesian(cx, cy, innerR, startAngle);
29
29
  const endInner = polarToCartesian(cx, cy, innerR, endAngle);
30
- return `
31
- M ${startOuter.x} ${startOuter.y}
32
- A ${outerR} ${outerR} 0 ${largeArcFlag} 0 ${endOuter.x} ${endOuter.y}
33
- L ${startInner.x} ${startInner.y}
34
- A ${innerR} ${innerR} 0 ${largeArcFlag} 1 ${endInner.x} ${endInner.y}
35
- Z
30
+ return `
31
+ M ${startOuter.x} ${startOuter.y}
32
+ A ${outerR} ${outerR} 0 ${largeArcFlag} 0 ${endOuter.x} ${endOuter.y}
33
+ L ${startInner.x} ${startInner.y}
34
+ A ${innerR} ${innerR} 0 ${largeArcFlag} 1 ${endInner.x} ${endInner.y}
35
+ Z
36
36
  `.trim();
37
37
  };
38
38
  export const createDonutSegments = (languages, cx, geometry, colours, stroke) => {
@@ -1,7 +1,18 @@
1
+ import type { Geometry, Language } from "../types.js";
1
2
  export declare function resolveLayout(count: number, stroke: boolean): {
2
3
  isShifted: boolean;
3
4
  useStroke: boolean;
4
5
  };
5
- export declare function calculateChartCenter(width: number, isShifted: boolean): number;
6
- export declare function calculateLegendStartX(chartCenterX: number, radius: number): number;
6
+ export declare function measureLegend(languages: Language[], isShifted: boolean): {
7
+ columnWidth: number;
8
+ legendWidth: number;
9
+ };
10
+ export declare const CONTENT_PAD = 20;
11
+ export declare function computeLayout(languages: Language[], isShifted: boolean, geometry: Geometry): {
12
+ chartX: number;
13
+ legendStartX: number;
14
+ columnWidth: number;
15
+ contentWidth: number;
16
+ contentHeight: number;
17
+ };
7
18
  //# sourceMappingURL=layout.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/charts/layout.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;;;EAK3D;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAK9E;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAElF"}
1
+ {"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/charts/layout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEtD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;;;EAK3D;AAQD,wBAAgB,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,OAAO;;;EAgBtE;AAED,eAAO,MAAM,WAAW,KAAK,CAAC;AAE9B,wBAAgB,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;;;;;;EAa1F"}
@@ -1,17 +1,36 @@
1
- import { LEGEND_SHIFT_THRESHOLD, LEGEND_STYLES, CHART_MARGIN_RIGHT } from "../constants/styles.js";
1
+ import { LEGEND_SHIFT_THRESHOLD, LEGEND_STYLES, CHART_MARGIN_RIGHT, ARIAL_CHAR_WIDTHS, DEFAULT_CHAR_WIDTH } from "../constants/styles.js";
2
2
  export function resolveLayout(count, stroke) {
3
3
  return {
4
4
  isShifted: count > LEGEND_SHIFT_THRESHOLD,
5
5
  useStroke: count > 1 ? stroke : false
6
6
  };
7
7
  }
8
- export function calculateChartCenter(width, isShifted) {
9
- const legendWidth = isShifted
10
- ? LEGEND_STYLES.COLUMN_WIDTH * 2
11
- : LEGEND_STYLES.WIDTH;
12
- return (width - legendWidth - CHART_MARGIN_RIGHT) / 2;
8
+ const measureText = (text, fontSize) => [...text]
9
+ .reduce((sum, ch) => sum + (ARIAL_CHAR_WIDTHS[ch] ?? DEFAULT_CHAR_WIDTH), 0) * fontSize / 1000;
10
+ const estimateEntryWidth = (label) => LEGEND_STYLES.SQUARE_SIZE + LEGEND_STYLES.TEXT_GAP + measureText(label, LEGEND_STYLES.FONT_SIZE);
11
+ export function measureLegend(languages, isShifted) {
12
+ const entryWidth = (lang) => estimateEntryWidth(`${lang.lang} ${lang.pct.toFixed(1)}%`);
13
+ if (!isShifted) {
14
+ const width = languages.reduce((max, l) => Math.max(max, entryWidth(l)), 0);
15
+ return { columnWidth: width, legendWidth: width };
16
+ }
17
+ const half = Math.ceil(languages.length / 2);
18
+ const col0Width = languages.slice(0, half).reduce((max, l) => Math.max(max, entryWidth(l)), 0);
19
+ const col1Width = languages.slice(half).reduce((max, l) => Math.max(max, entryWidth(l)), 0);
20
+ const columnWidth = col0Width + LEGEND_STYLES.COLUMN_GAP;
21
+ const legendWidth = columnWidth + col1Width;
22
+ return { columnWidth, legendWidth };
13
23
  }
14
- export function calculateLegendStartX(chartCenterX, radius) {
15
- return chartCenterX + radius + CHART_MARGIN_RIGHT;
24
+ export const CONTENT_PAD = 20;
25
+ export function computeLayout(languages, isShifted, geometry) {
26
+ const { columnWidth, legendWidth } = measureLegend(languages, isShifted);
27
+ const chartX = CONTENT_PAD + geometry.OUTER_RADIUS;
28
+ const legendStartX = chartX + geometry.OUTER_RADIUS + CHART_MARGIN_RIGHT;
29
+ const contentWidth = legendStartX + legendWidth + CONTENT_PAD;
30
+ const rows = isShifted ? Math.ceil(languages.length / 2) : languages.length;
31
+ const legendBottom = LEGEND_STYLES.START_Y + (rows - 1) * LEGEND_STYLES.ROW_HEIGHT + LEGEND_STYLES.SQUARE_SIZE;
32
+ const chartBottom = geometry.CENTER_Y + geometry.OUTER_RADIUS;
33
+ const contentHeight = Math.max(chartBottom, legendBottom) + CONTENT_PAD;
34
+ return { chartX, legendStartX, columnWidth, contentWidth, contentHeight };
16
35
  }
17
36
  //# sourceMappingURL=layout.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/charts/layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEnG,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,MAAe;IAC1D,OAAO;QACL,SAAS,EAAE,KAAK,GAAG,sBAAsB;QACzC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAa,EAAE,SAAkB;IACpE,MAAM,WAAW,GAAG,SAAS;QAC3B,CAAC,CAAC,aAAa,CAAC,YAAY,GAAG,CAAC;QAChC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;IACxB,OAAO,CAAC,KAAK,GAAG,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAoB,EAAE,MAAc;IACxE,OAAO,YAAY,GAAG,MAAM,GAAG,kBAAkB,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/charts/layout.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import type { Language, Theme } from "../types.js";
2
- export declare function createLegend(languages: Language[], isShifted: boolean, selectedTheme: Theme, legendStartX: number, stroke: boolean): string;
2
+ export declare function createLegend(languages: Language[], isShifted: boolean, selectedTheme: Theme, legendStartX: number, stroke: boolean, columnWidth: number): string;
3
3
  //# sourceMappingURL=legend.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"legend.d.ts","sourceRoot":"","sources":["../../src/charts/legend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAgB,YAAY,CAC1B,SAAS,EAAM,QAAQ,EAAE,EACzB,SAAS,EAAM,OAAO,EACtB,aAAa,EAAE,KAAK,EACpB,YAAY,EAAG,MAAM,EACrB,MAAM,EAAS,OAAO,GACrB,MAAM,CA2CR"}
1
+ {"version":3,"file":"legend.d.ts","sourceRoot":"","sources":["../../src/charts/legend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAgB,YAAY,CAC1B,SAAS,EAAM,QAAQ,EAAE,EACzB,SAAS,EAAM,OAAO,EACtB,aAAa,EAAE,KAAK,EACpB,YAAY,EAAG,MAAM,EACrB,MAAM,EAAS,OAAO,EACtB,WAAW,EAAI,MAAM,GACpB,MAAM,CA2CR"}
@@ -1,5 +1,5 @@
1
1
  import { LEGEND_STYLES } from "../constants/styles.js";
2
- export function createLegend(languages, isShifted, selectedTheme, legendStartX, stroke) {
2
+ export function createLegend(languages, isShifted, selectedTheme, legendStartX, stroke, columnWidth) {
3
3
  const numLangs = languages.length;
4
4
  return languages.map((lang, i) => {
5
5
  let x, y;
@@ -11,31 +11,31 @@ export function createLegend(languages, isShifted, selectedTheme, legendStartX,
11
11
  const half = Math.ceil(numLangs / 2);
12
12
  const col = Math.floor(i / half);
13
13
  const row = i % half;
14
- x = legendStartX + col * LEGEND_STYLES.COLUMN_WIDTH;
14
+ x = legendStartX + col * columnWidth;
15
15
  y = LEGEND_STYLES.START_Y + row * LEGEND_STYLES.ROW_HEIGHT;
16
16
  }
17
17
  const fill = selectedTheme.colours[i];
18
18
  const strokeAttr = stroke
19
19
  ? ` stroke="#000" stroke-width="0.5" stroke-linejoin="round"`
20
20
  : ``;
21
- return `
22
- <rect
23
- x="${x}"
24
- y="${y - LEGEND_STYLES.SQUARE_SIZE + 3}"
25
- width="${LEGEND_STYLES.SQUARE_SIZE}"
26
- height="${LEGEND_STYLES.SQUARE_SIZE}"
27
- fill="${fill}"
28
- rx="${LEGEND_STYLES.SQUARE_RADIUS}"${strokeAttr}
29
- />
30
- <text
31
- x="${x + LEGEND_STYLES.SQUARE_SIZE + 5}"
32
- y="${y}"
33
- fill="${selectedTheme.text}"
34
- font-size="${LEGEND_STYLES.FONT_SIZE}"
35
- font-family="Arial"
36
- >
37
- ${lang.lang} ${lang.pct.toFixed(1)}%
38
- </text>
21
+ return `
22
+ <rect
23
+ x="${x}"
24
+ y="${y - LEGEND_STYLES.SQUARE_SIZE + 3}"
25
+ width="${LEGEND_STYLES.SQUARE_SIZE}"
26
+ height="${LEGEND_STYLES.SQUARE_SIZE}"
27
+ fill="${fill}"
28
+ rx="${LEGEND_STYLES.SQUARE_RADIUS}"${strokeAttr}
29
+ />
30
+ <text
31
+ x="${x + LEGEND_STYLES.SQUARE_SIZE + LEGEND_STYLES.TEXT_GAP}"
32
+ y="${y}"
33
+ fill="${selectedTheme.text}"
34
+ font-size="${LEGEND_STYLES.FONT_SIZE}"
35
+ font-family="Arial"
36
+ >
37
+ ${lang.lang} ${lang.pct.toFixed(1)}%
38
+ </text>
39
39
  `;
40
40
  }).join('');
41
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"legend.js","sourceRoot":"","sources":["../../src/charts/legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,wBAAwB,CAAC;AAG9D,MAAM,UAAU,YAAY,CAC1B,SAAyB,EACzB,SAAsB,EACtB,aAAoB,EACpB,YAAqB,EACrB,MAAsB;IAEtB,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC;IAElC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAS,EAAE,CAAS,CAAC;QAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,CAAC,GAAG,YAAY,CAAC;YACjB,CAAC,GAAG,aAAa,CAAC,OAAO,GAAG,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACrC,MAAM,GAAG,GAAI,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAClC,MAAM,GAAG,GAAI,CAAC,GAAG,IAAI,CAAC;YAEtB,CAAC,GAAG,YAAY,GAAG,GAAG,GAAG,aAAa,CAAC,YAAY,CAAC;YACpD,CAAC,GAAG,aAAa,CAAC,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM;YACvB,CAAC,CAAC,2DAA2D;YAC7D,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;;aAEE,CAAC;aACD,CAAC,GAAG,aAAa,CAAC,WAAW,GAAG,CAAC;iBAC7B,aAAa,CAAC,WAAW;kBACxB,aAAa,CAAC,WAAW;gBAC3B,IAAI;cACN,aAAa,CAAC,aAAa,IAAI,UAAU;;;aAG1C,CAAC,GAAG,aAAa,CAAC,WAAW,GAAG,CAAC;aACjC,CAAC;gBACE,aAAa,CAAC,IAAI;qBACb,aAAa,CAAC,SAAS;;;QAGpC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;;KAEnC,CAAC;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"legend.js","sourceRoot":"","sources":["../../src/charts/legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,wBAAwB,CAAC;AAG9D,MAAM,UAAU,YAAY,CAC1B,SAAyB,EACzB,SAAsB,EACtB,aAAoB,EACpB,YAAqB,EACrB,MAAsB,EACtB,WAAqB;IAErB,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC;IAElC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAS,EAAE,CAAS,CAAC;QAEzB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,CAAC,GAAG,YAAY,CAAC;YACjB,CAAC,GAAG,aAAa,CAAC,OAAO,GAAG,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACrC,MAAM,GAAG,GAAI,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAClC,MAAM,GAAG,GAAI,CAAC,GAAG,IAAI,CAAC;YAEtB,CAAC,GAAG,YAAY,GAAG,GAAG,GAAG,WAAW,CAAC;YACrC,CAAC,GAAG,aAAa,CAAC,OAAO,GAAG,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM;YACvB,CAAC,CAAC,2DAA2D;YAC7D,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;;aAEE,CAAC;aACD,CAAC,GAAG,aAAa,CAAC,WAAW,GAAG,CAAC;iBAC7B,aAAa,CAAC,WAAW;kBACxB,aAAa,CAAC,WAAW;gBAC3B,IAAI;cACN,aAAa,CAAC,aAAa,IAAI,UAAU;;;aAG1C,CAAC,GAAG,aAAa,CAAC,WAAW,GAAG,aAAa,CAAC,QAAQ;aACtD,CAAC;gBACE,aAAa,CAAC,IAAI;qBACb,aAAa,CAAC,SAAS;;;QAGpC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;;KAEnC,CAAC;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import type { Language, Theme, ChartResult } from "../types.js";
2
- export declare function generatePieChart(normalizedLanguages: Language[], selectedTheme: Theme, width: number, stroke: boolean): ChartResult;
2
+ export declare function generatePieChart(normalizedLanguages: Language[], selectedTheme: Theme, stroke: boolean): ChartResult;
3
3
  //# sourceMappingURL=pie.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pie.d.ts","sourceRoot":"","sources":["../../src/charts/pie.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAA2B,MAAM,aAAa,CAAC;AAMzF,wBAAgB,gBAAgB,CAC9B,mBAAmB,EAAE,QAAQ,EAAE,EAC/B,aAAa,EAAQ,KAAK,EAC1B,KAAK,EAAgB,MAAM,EAC3B,MAAM,EAAe,OAAO,GAC3B,WAAW,CAUb"}
1
+ {"version":3,"file":"pie.d.ts","sourceRoot":"","sources":["../../src/charts/pie.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAShE,wBAAgB,gBAAgB,CAC9B,mBAAmB,EAAE,QAAQ,EAAE,EAC/B,aAAa,EAAQ,KAAK,EAC1B,MAAM,EAAe,OAAO,GAC3B,WAAW,CA2Bb"}
@@ -1,13 +1,12 @@
1
- import { resolveLayout, calculateChartCenter, calculateLegendStartX } from "./layout.js";
2
1
  import { PIE_GEOMETRY } from "../constants/geometry.js";
3
2
  import { createDonutSegments } from "./geometry.js";
4
3
  import { createLegend } from "./legend.js";
5
- export function generatePieChart(normalizedLanguages, selectedTheme, width, stroke) {
4
+ import { resolveLayout, computeLayout } from "./layout.js";
5
+ export function generatePieChart(normalizedLanguages, selectedTheme, stroke) {
6
6
  const { isShifted, useStroke } = resolveLayout(normalizedLanguages.length, stroke);
7
- const chartX = calculateChartCenter(width, isShifted);
8
- const legendStartX = calculateLegendStartX(chartX, PIE_GEOMETRY.OUTER_RADIUS);
7
+ const { chartX, legendStartX, columnWidth, contentWidth, contentHeight } = computeLayout(normalizedLanguages, isShifted, PIE_GEOMETRY);
9
8
  const segments = createDonutSegments(normalizedLanguages, chartX, PIE_GEOMETRY, [...selectedTheme.colours], useStroke);
10
- const legend = createLegend(normalizedLanguages, isShifted, selectedTheme, legendStartX, useStroke);
11
- return { segments, legend };
9
+ const legend = createLegend(normalizedLanguages, isShifted, selectedTheme, legendStartX, useStroke, columnWidth);
10
+ return { segments, legend, contentWidth, contentHeight };
12
11
  }
13
12
  //# sourceMappingURL=pie.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pie.js","sourceRoot":"","sources":["../../src/charts/pie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,YAAY,EAAgD,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAyC,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAgD,MAAM,aAAa,CAAC;AAEzF,MAAM,UAAU,gBAAgB,CAC9B,mBAA+B,EAC/B,aAA0B,EAC1B,KAA2B,EAC3B,MAA4B;IAE5B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnF,MAAM,MAAM,GAAqB,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACxE,MAAM,YAAY,GAAe,qBAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAE1F,MAAM,QAAQ,GAAG,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;IACvH,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAEpG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"pie.js","sourceRoot":"","sources":["../../src/charts/pie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAuB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAgB,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,YAAY,EAAuB,MAAM,aAAa,CAAC;AAChE,OAAO,EACL,aAAa,EACb,aAAa,EACd,MAAM,aAAa,CAAC;AAErB,MAAM,UAAU,gBAAgB,CAC9B,mBAA+B,EAC/B,aAA0B,EAC1B,MAA4B;IAE5B,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,EACL,MAAM,EACN,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,aAAa,EACb,GAAG,aAAa,CAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,mBAAmB,CAClC,mBAAmB,EACnB,MAAM,EACN,YAAY,EACZ,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC1B,SAAS,CACV,CAAC;IACF,MAAM,MAAM,GAAG,YAAY,CACzB,mBAAmB,EACnB,SAAS,EACT,aAAa,EACb,YAAY,EACZ,SAAS,EACT,WAAW,CACZ,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;AAC3D,CAAC"}
@@ -8,8 +8,8 @@ export declare const LEGEND_STYLES: {
8
8
  readonly SQUARE_SIZE: 12;
9
9
  readonly SQUARE_RADIUS: 2;
10
10
  readonly FONT_SIZE: 11;
11
- readonly WIDTH: 130;
12
- readonly COLUMN_WIDTH: 105;
11
+ readonly TEXT_GAP: 5;
12
+ readonly COLUMN_GAP: 15;
13
13
  };
14
14
  export declare const ERROR_STYLES: {
15
15
  readonly TEXT_Y: 100;
@@ -18,4 +18,6 @@ export declare const ERROR_STYLES: {
18
18
  };
19
19
  export declare const LEGEND_SHIFT_THRESHOLD = 8;
20
20
  export declare const CHART_MARGIN_RIGHT = 20;
21
+ export declare const ARIAL_CHAR_WIDTHS: Record<string, number>;
22
+ export declare const DEFAULT_CHAR_WIDTH = 556;
21
23
  //# sourceMappingURL=styles.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/constants/styles.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;CAQhB,CAAC;AAEX,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AAEX,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,kBAAkB,KAAS,CAAC"}
1
+ {"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/constants/styles.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;CAQhB,CAAC;AAEX,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AAEX,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,kBAAkB,KAAS,CAAC;AAEzC,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAc3C,CAAC;AACX,eAAO,MAAM,kBAAkB,MAAM,CAAC"}
@@ -8,8 +8,8 @@ export const LEGEND_STYLES = {
8
8
  SQUARE_SIZE: 12,
9
9
  SQUARE_RADIUS: 2,
10
10
  FONT_SIZE: 11,
11
- WIDTH: 130,
12
- COLUMN_WIDTH: 105
11
+ TEXT_GAP: 5,
12
+ COLUMN_GAP: 15,
13
13
  };
14
14
  export const ERROR_STYLES = {
15
15
  TEXT_Y: 100,
@@ -18,4 +18,20 @@ export const ERROR_STYLES = {
18
18
  };
19
19
  export const LEGEND_SHIFT_THRESHOLD = 8;
20
20
  export const CHART_MARGIN_RIGHT = 20;
21
+ export const ARIAL_CHAR_WIDTHS = {
22
+ " ": 278, "!": 278, "#": 556, "%": 889, "+": 584, ".": 278, "-": 333,
23
+ "0": 556, "1": 556, "2": 556, "3": 556, "4": 556,
24
+ "5": 556, "6": 556, "7": 556, "8": 556, "9": 556,
25
+ A: 667, B: 667, C: 722, D: 722, E: 667, F: 611,
26
+ G: 778, H: 722, I: 278, J: 500, K: 667, L: 556,
27
+ M: 833, N: 722, O: 778, P: 667, Q: 778, R: 722,
28
+ S: 667, T: 611, U: 722, V: 667, W: 944, X: 667,
29
+ Y: 667, Z: 611,
30
+ a: 556, b: 556, c: 500, d: 556, e: 556, f: 278,
31
+ g: 556, h: 556, i: 222, j: 222, k: 500, l: 222,
32
+ m: 833, n: 556, o: 556, p: 556, q: 556, r: 333,
33
+ s: 500, t: 278, u: 556, v: 500, w: 722, x: 500,
34
+ y: 500, z: 500
35
+ };
36
+ export const DEFAULT_CHAR_WIDTH = 556;
21
37
  //# sourceMappingURL=styles.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/constants/styles.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAK,EAAE;IACb,SAAS,EAAE,EAAE;CACL,CAAC;AAEX,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAQ,EAAE;IACjB,UAAU,EAAK,EAAE;IACjB,WAAW,EAAI,EAAE;IACjB,aAAa,EAAE,CAAC;IAChB,SAAS,EAAM,EAAE;IACjB,KAAK,EAAU,GAAG;IAClB,YAAY,EAAG,GAAG;CACV,CAAC;AAEX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAK,GAAG;IACd,SAAS,EAAE,EAAE;IACb,MAAM,EAAK,SAAS;CACZ,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAO,EAAE,CAAC"}
1
+ {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/constants/styles.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAK,EAAE;IACb,SAAS,EAAE,EAAE;CACL,CAAC;AAEX,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAW,EAAE;IACpB,UAAU,EAAQ,EAAE;IACpB,WAAW,EAAO,EAAE;IACpB,aAAa,EAAK,CAAC;IACnB,SAAS,EAAS,EAAE;IACpB,QAAQ,EAAU,CAAC;IACnB,UAAU,EAAQ,EAAE;CACZ,CAAC;AAEX,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAK,GAAG;IACd,SAAS,EAAE,EAAE;IACb,MAAM,EAAK,SAAS;CACZ,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAO,EAAE,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IACpE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAChD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAChD,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IACd,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;IAC9C,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG;CACN,CAAC;AACX,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import type { Language, Theme, ChartType, ChartResult } from "../types.js";
2
- export declare function generateChartData(data: Language[], theme: Theme, chartType: ChartType, width: number, stroke: boolean): ChartResult;
2
+ export declare function generateChartData(data: Language[], theme: Theme, chartType: ChartType, stroke: boolean): ChartResult;
3
3
  //# sourceMappingURL=chart.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../src/render/chart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAc3E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAO,QAAQ,EAAE,EACrB,KAAK,EAAM,KAAK,EAChB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAM,MAAM,EACjB,MAAM,EAAK,OAAO,GACjB,WAAW,CAGb"}
1
+ {"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../src/render/chart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAa3E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAO,QAAQ,EAAE,EACrB,KAAK,EAAM,KAAK,EAChB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAK,OAAO,GACjB,WAAW,CAGb"}
@@ -4,8 +4,8 @@ const CHART_GENERATORS = {
4
4
  donut: generateDonutChart,
5
5
  pie: generatePieChart,
6
6
  };
7
- export function generateChartData(data, theme, chartType, width, stroke) {
7
+ export function generateChartData(data, theme, chartType, stroke) {
8
8
  const generator = CHART_GENERATORS[chartType] || CHART_GENERATORS.donut;
9
- return generator(data, theme, width, stroke);
9
+ return generator(data, theme, stroke);
10
10
  }
11
11
  //# sourceMappingURL=chart.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"chart.js","sourceRoot":"","sources":["../../src/render/chart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAA8B,MAAM,kBAAkB,CAAC;AAEhF,MAAM,gBAAgB,GAKF;IAClB,KAAK,EAAE,kBAAkB;IACzB,GAAG,EAAI,gBAAgB;CACxB,CAAA;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAqB,EACrB,KAAgB,EAChB,SAAoB,EACpB,KAAiB,EACjB,MAAkB;IAElB,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC;IACxE,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC"}
1
+ {"version":3,"file":"chart.js","sourceRoot":"","sources":["../../src/render/chart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAA8B,MAAM,kBAAkB,CAAC;AAEhF,MAAM,gBAAgB,GAIF;IAClB,KAAK,EAAE,kBAAkB;IACzB,GAAG,EAAI,gBAAgB;CACxB,CAAA;AAED,MAAM,UAAU,iBAAiB,CAC/B,IAAqB,EACrB,KAAgB,EAChB,SAAoB,EACpB,MAAkB;IAElB,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC;IACxE,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC"}
@@ -7,13 +7,13 @@ export function renderError(message, width, height, selectedTheme) {
7
7
  const truncated = message.length > maxLen
8
8
  ? sanitize(message.slice(0, maxLen)) + "..."
9
9
  : sanitize(message);
10
- return `
11
- <svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
12
- <rect width="${width}" height="${height}" fill="${background}" rx="10"/>
13
- <text x="${width / 2}" y="${ERROR_STYLES.TEXT_Y}" text-anchor="middle" fill="${ERROR_STYLES.COLOUR}" font-family="Arial" font-size="${ERROR_STYLES.FONT_SIZE}">
14
- Error: ${truncated}
15
- </text>
16
- </svg>
10
+ return `
11
+ <svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
12
+ <rect width="${width}" height="${height}" fill="${background}" rx="10"/>
13
+ <text x="${width / 2}" y="${ERROR_STYLES.TEXT_Y}" text-anchor="middle" fill="${ERROR_STYLES.COLOUR}" font-family="Arial" font-size="${ERROR_STYLES.FONT_SIZE}">
14
+ Error: ${truncated}
15
+ </text>
16
+ </svg>
17
17
  `.trim();
18
18
  }
19
19
  //# sourceMappingURL=error.js.map
@@ -1,2 +1,3 @@
1
- export declare function renderSvg(width: number, height: number, background: string, segments: string, legend: string, title: string | null, textColour: string): string;
1
+ import type { ChartResult } from "../types.js";
2
+ export declare function renderSvg(width: number, height: number, background: string, chart: ChartResult, title: string | null, textColour: string): string;
2
3
  //# sourceMappingURL=svg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../src/render/svg.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,CACvB,KAAK,EAAO,MAAM,EAClB,MAAM,EAAM,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAI,MAAM,EAClB,MAAM,EAAM,MAAM,EAClB,KAAK,EAAO,MAAM,GAAG,IAAI,EACzB,UAAU,EAAE,MAAM,GACjB,MAAM,CAoBR"}
1
+ {"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../src/render/svg.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,wBAAgB,SAAS,CACvB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EACjD,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAC3D,MAAM,CAuBR"}
@@ -1,22 +1,25 @@
1
1
  import { TITLE_STYLES } from "../constants/styles.js";
2
- export function renderSvg(width, height, background, segments, legend, title, textColour) {
3
- const titleElement = title ? `
4
- <text
5
- x="${width / 2}"
6
- y="${TITLE_STYLES.TEXT_Y}"
7
- text-anchor="middle" fill="${textColour}"
8
- font-family="Arial" font-size="${TITLE_STYLES.FONT_SIZE}"
9
- >
10
- ${title}
11
- </text>
2
+ export function renderSvg(width, height, background, chart, title, textColour) {
3
+ const titleElement = title ? `
4
+ <text
5
+ x="${chart.contentWidth / 2}"
6
+ y="${TITLE_STYLES.TEXT_Y}"
7
+ text-anchor="middle" fill="${textColour}"
8
+ font-family="Arial" font-size="${TITLE_STYLES.FONT_SIZE}"
9
+ >
10
+ ${title}
11
+ </text>
12
12
  ` : '';
13
- return `
14
- <svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
15
- <rect width="${width}" height="${height}" fill="${background}" rx="10"/>
16
- ${titleElement}
17
- ${segments}
18
- ${legend}
19
- </svg>
20
- `.trim();
13
+ return `
14
+ <svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
15
+ <rect width="${width}" height="${height}" fill="${background}" rx="10"/>
16
+ <svg width="${width}" height="${height}"
17
+ viewBox="0 0 ${chart.contentWidth} ${chart.contentHeight}"
18
+ preserveAspectRatio="xMidYMid meet">
19
+ ${titleElement}
20
+ ${chart.segments}
21
+ ${chart.legend}
22
+ </svg>
23
+ </svg>`.trim();
21
24
  }
22
25
  //# sourceMappingURL=svg.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"svg.js","sourceRoot":"","sources":["../../src/render/svg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,MAAM,UAAU,SAAS,CACvB,KAAkB,EAClB,MAAkB,EAClB,UAAkB,EAClB,QAAkB,EAClB,MAAkB,EAClB,KAAyB,EACzB,UAAkB;IAElB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC;;WAEpB,KAAK,GAAC,CAAC;WACP,YAAY,CAAC,MAAM;mCACK,UAAU;uCACN,YAAY,CAAC,SAAS;;QAErD,KAAK;;GAEV,CAAC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;kBACS,KAAK,aAAa,MAAM;qBACrB,KAAK,aAAa,MAAM,WAAW,UAAU;QAC1D,YAAY;QACZ,QAAQ;QACR,MAAM;;GAEX,CAAC,IAAI,EAAE,CAAC;AACX,CAAC"}
1
+ {"version":3,"file":"svg.js","sourceRoot":"","sources":["../../src/render/svg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAGrD,MAAM,UAAU,SAAS,CACvB,KAAa,EAAE,MAAc,EAAE,UAAkB,EACjD,KAAkB,EAAE,KAAoB,EAAE,UAAkB;IAE5D,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC;;WAEpB,KAAK,CAAC,YAAY,GAAG,CAAC;WACtB,YAAY,CAAC,MAAM;mCACK,UAAU;uCACN,YAAY,CAAC,SAAS;;QAErD,KAAK;;GAEV,CAAC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;kBACS,KAAK,aAAa,MAAM;qBACrB,KAAK,aAAa,MAAM,WAAW,UAAU;oBAC9C,KAAK,aAAa,MAAM;0BAClB,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,aAAa;;UAEzD,YAAY;UACZ,KAAK,CAAC,QAAQ;UACd,KAAK,CAAC,MAAM;;WAEX,CAAC,IAAI,EAAE,CAAC;AACnB,CAAC"}
package/dist/types.d.ts CHANGED
@@ -15,6 +15,8 @@ export type ChartType = "donut" | "pie";
15
15
  export type ChartResult = {
16
16
  segments: string;
17
17
  legend: string;
18
+ contentWidth: number;
19
+ contentHeight: number;
18
20
  };
19
21
  export type Theme = {
20
22
  readonly colours: readonly string[];
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAG,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAM,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAI,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAK,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAO,MAAM,CAAC;CAC1B,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAG,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAM,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAO,MAAM,CAAC;IACtB,MAAM,EAAS,MAAM,CAAC;IACtB,YAAY,EAAG,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAK,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAO,MAAM,CAAC;CAC1B,CAAC"}