fix: fix crash when project or language name was __proto__ or other prototype pollution keyword

Author: Eldemarkki

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
-  "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix"
 }

package-lock.json

@@ -10,15 +10,15 @@
     "@mantine/next": "^6.0.21",
     "@mantine/notifications": "^7.3.2",
     "@radix-ui/react-icons": "^1.3.0",
-    "chart.js": "^4.4.1",
+    "chart.js": "^4.5.1",
     "date-fns": "^4.1.0",
     "formik": "^2.4.5",
     "i18next": "^23.7.12",
     "i18next-resources-to-backend": "^1.2.0",
     "next": "^14.0.4",
     "next-i18n-router": "^5.1.0",
     "react": "^18.2.0",
-    "react-chartjs-2": "^5.2.0",
+    "react-chartjs-2": "^5.3.1",
     "react-cookie": "^8.0.1",
     "react-dom": "^18.2.0",
     "react-feather": "^2.0.10",
@@ -41,7 +41,7 @@
     "@storybook/nextjs": "^8.6.9",
     "@storybook/react": "^8.6.9",
     "@svgr/webpack": "^8.1.0",
-    "@types/node": "^20.12.5",
+    "@types/node": "^25.0.3",
     "@types/react": "^18.2.74",
     "@types/react-dom": "^18.2.24",
     "@types/react-router": "^5.1.20",
@@ -55,7 +55,7 @@
     "prettier": "^3.1.1",
     "prettier-eslint": "^16.2.0",
     "storybook": "^8.6.9",
-    "typescript": "^5.3.3",
+    "typescript": "^5.9.3",
     "vitest": "^3.0.9"
   }
 }

package.json

@@ -1,8 +1,8 @@
 import { Text } from "@mantine/core";
-import { groupBy, sumBy } from "../utils/arrayUtils";
+import { sumBy } from "../utils/arrayUtils";
 import { calculateTickValues } from "../utils/chartUtils";
 import { prettifyProgrammingLanguageName } from "../utils/programmingLanguagesUtils";
-import { colors, isColor } from "../utils/colors";
+import { colors } from "../utils/colors";
 import { Bar } from "react-chartjs-2";
 import {
   Chart as ChartJS,
@@ -55,7 +55,7 @@ const defaultColors = [
   "#b15928",
 ];
 
-const chosenRandomColors: Record<string, string> = {};
+const chosenRandomColors = new Map<string, string>();
 
 function getLanguageColor(str: string): string {
   let language = str.toLowerCase();
@@ -64,18 +64,24 @@ function getLanguageColor(str: string): string {
   if (language.split(" ").length > 1) {
     language = language
       .split(" ")
-      .filter((possibleName) => isColor(possibleName))[0];
+      .filter((possibleName) => colors.has(possibleName))[0];
   }
 
-  if (isColor(language)) {
-    return colors[language];
+  if (colors.has(language)) {
+    // Should never be undefined
+    return colors.get(language) ?? "#000000";
   }
 
-  if (language in chosenRandomColors) return chosenRandomColors[language];
+  if (chosenRandomColors.has(language)) {
+    // Should never be undefined
+
+    return chosenRandomColors.get(language) ?? "#000000";
+  }
 
   const randomColor =
     defaultColors[Math.floor(defaultColors.length * Math.random())];
-  chosenRandomColors[language] = randomColor;
+  chosenRandomColors.set(language, randomColor);
+
   return randomColor;
 }
 
@@ -87,21 +93,28 @@ export const PerProjectChart = ({
 }: PerProjectChartProps) => {
   if (entries.length === 0) return <Text>No data</Text>;
 
-  let languageNames = entries
+  const languageNames = entries
     .sort((entry1, entry2) => entry2.duration - entry1.duration)
     .map((entry) => entry.language || "other")
     .filter((item, index, array) => array.indexOf(item) === index)
-    .slice(0, 9);
-  languageNames.push("other");
-  languageNames = languageNames.reverse();
+    .slice(0, 9)
+    .concat("other") // TODO: Why is this here
+    .toReversed();
 
   // Get the total time spent on each project
-  const projectGroups = groupBy(entries, (e) => e.project_name ?? "Unknown");
+  const projectGroups = Object.groupBy(
+    entries,
+    (x) => x.project_name ?? "undefined",
+  );
+
   const totalTimeByProject = Object.keys(projectGroups).map((projectName) => {
-    const projectEntries = projectGroups[projectName];
-    const langGroups = groupBy(projectEntries, (e) => e.language);
+    const projectEntries = projectGroups[projectName] ?? [];
+    const langGroups = Object.groupBy(
+      projectEntries,
+      (e) => e.language ?? "undefined",
+    );
     const totalTimeByLanguage = Object.keys(langGroups).map((lang) => {
-      const langEntries = langGroups[lang];
+      const langEntries = langGroups[lang] ?? [];
       return {
         language: lang,
         duration: sumBy(langEntries, (e) => e.duration),

src/components/PerProjectChart.tsx

@@ -1,4 +1,4 @@
-import { groupBy, sumBy } from "../../utils/arrayUtils";
+import { sumBy } from "../../utils/arrayUtils";
 import { isStringNull } from "../../utils/stringUtils";
 
 interface TopLanguagesRequirement {
@@ -7,11 +7,14 @@ interface TopLanguagesRequirement {
 }
 
 export const getAllTimeTopLanguages = (entries: TopLanguagesRequirement[]) => {
-  const byLanguage = groupBy(entries, (entry) => entry.language);
+  const byLanguage = Object.groupBy(
+    entries,
+    (entry) => entry.language ?? "undefined",
+  );
   return Object.keys(byLanguage)
     .map((language) => ({
       language: isStringNull(language) ? undefined : language,
-      duration: sumBy(byLanguage[language], (entry) => entry.duration),
+      duration: sumBy(byLanguage[language] ?? [], (entry) => entry.duration),
     }))
     .sort((a, b) => b.duration - a.duration);
 };

src/lib/topLanguagesStatistics/topLanguagesStatistics.ts

@@ -1,4 +1,4 @@
-import { groupBy, sumBy } from "../../utils/arrayUtils";
+import { sumBy } from "../../utils/arrayUtils";
 import { isStringNull } from "../../utils/stringUtils";
 
 interface TopProjectsRequirements {
@@ -7,11 +7,14 @@ interface TopProjectsRequirements {
 }
 
 export const getAllTimeTopProjects = (entries: TopProjectsRequirements[]) => {
-  const byProject = groupBy(entries, (entry) => entry.project_name);
+  const byProject = Object.groupBy(
+    entries,
+    (entry) => entry.project_name ?? "undefined",
+  );
   return Object.keys(byProject)
     .map((project) => ({
       project_name: isStringNull(project) ? undefined : project,
-      duration: sumBy(byProject[project], (entry) => entry.duration),
+      duration: sumBy(byProject[project] ?? [], (entry) => entry.duration),
     }))
     .sort((a, b) => b.duration - a.duration);
 };

src/lib/topProjectsStatistics/topProjectsStatistics.ts

@@ -1,19 +1,3 @@
-export function groupBy<T>(
-  array: T[],
-  predicate: (elem: T) => string | number | symbol | undefined | null,
-) {
-  return array.reduce<Record<string | number | symbol, T[]>>((b, e) => {
-    const k = predicate(e);
-    const key = k ?? "undefined";
-    if (key in b) {
-      b[key].push(e);
-    } else {
-      b[key] = [e];
-    }
-    return b;
-  }, {});
-}
-
 export function sumBy<T>(array: T[], predicate: (elem: T) => number) {
   return array.reduce((prev, curr) => prev + predicate(curr), 0);
 }