review comments

fehmer · fehmer · commit 27accfbe2488 · 2025-11-15T14:25:00.000+01:00
diff --git a/backend/__tests__/__integration__/dal/leaderboards.isolated.spec.ts b/backend/__tests__/__integration__/dal/leaderboards.isolated.spec.ts
@@ -59,7 +59,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => omit(it, "_id"));
+      const lb = result.map((it) => omit(it, ["_id"]));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: rank1 }),
@@ -86,7 +86,7 @@ describe("LeaderboardsDal", () => {
       )) as LeaderboardsDal.DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => omit(it, "_id"));
+      const lb = result.map((it) => omit(it, ["_id"]));
 
       expect(lb).toEqual([
         expectedLbEntry("60", { rank: 1, user: rank1 }),
@@ -200,7 +200,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => omit(it, "_id"));
+      const lb = result.map((it) => omit(it, ["_id"]));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: noBadge }),
@@ -239,7 +239,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => omit(it, "_id"));
+      const lb = result.map((it) => omit(it, ["_id"]));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: noPremium }),
diff --git a/backend/__tests__/api/controllers/result.spec.ts b/backend/__tests__/api/controllers/result.spec.ts
@@ -489,15 +489,14 @@ describe("result controller test", () => {
     it("should apply defaults on missing data", async () => {
       //GIVEN
       const result = givenDbResult(uid);
-      const partialResult = omit(
-        result,
+      const partialResult = omit(result, [
         "difficulty",
         "language",
         "funbox",
         "lazyMode",
         "punctuation",
-        "numbers"
-      );
+        "numbers",
+      ]);
 
       const resultIdString = result._id.toHexString();
       const tagIds = [
diff --git a/backend/__tests__/utils/misc.spec.ts b/backend/__tests__/utils/misc.spec.ts
@@ -408,26 +408,26 @@ describe("Misc Utils", () => {
   describe("omit()", () => {
     it("should omit a single key", () => {
       const input = { a: 1, b: 2, c: 3 };
-      const result = Misc.omit(input, "b");
+      const result = Misc.omit(input, ["b"]);
       expect(result).toEqual({ a: 1, c: 3 });
     });
 
     it("should omit multiple keys", () => {
       const input = { a: 1, b: 2, c: 3, d: 4 };
-      const result = Misc.omit(input, "a", "d");
+      const result = Misc.omit(input, ["a", "d"]);
       expect(result).toEqual({ b: 2, c: 3 });
     });
 
     it("should return the same object if no keys are omitted", () => {
       const input = { x: 1, y: 2 };
-      const result = Misc.omit(input);
+      const result = Misc.omit(input, []);
       expect(result).toEqual({ x: 1, y: 2 });
     });
 
     it("should not mutate the original object", () => {
       const input = { foo: "bar", baz: "qux" };
       const copy = { ...input };
-      Misc.omit(input, "baz");
+      Misc.omit(input, ["baz"]);
       expect(input).toEqual(copy);
     });
 
@@ -445,7 +445,7 @@ describe("Misc Utils", () => {
         obj: { x: 1 },
         arr: [1, 2, 3],
       };
-      const result = Misc.omit(input, "bool", "arr");
+      const result = Misc.omit(input, ["bool", "arr"]);
       expect(result).toEqual({
         str: "hello",
         num: 123,
diff --git a/backend/src/api/controllers/ape-key.ts b/backend/src/api/controllers/ape-key.ts
@@ -17,7 +17,7 @@ import { ApeKey } from "@monkeytype/schemas/ape-keys";
 import { MonkeyRequest } from "../types";
 
 function cleanApeKey(apeKey: ApeKeysDAL.DBApeKey): ApeKey {
-  return omit(apeKey, "hash", "_id", "uid", "useCount") as ApeKey;
+  return omit(apeKey, ["hash", "_id", "uid", "useCount"]) as ApeKey;
 }
 
 export async function getApeKeys(
diff --git a/backend/src/api/controllers/leaderboard.ts b/backend/src/api/controllers/leaderboard.ts
@@ -57,7 +57,7 @@ export async function getLeaderboard(
   }
 
   const count = await LeaderboardsDAL.getCount(mode, mode2, language);
-  const normalizedLeaderboard = leaderboard.map((it) => omit(it, "_id"));
+  const normalizedLeaderboard = leaderboard.map((it) => omit(it, ["_id"]));
 
   return new MonkeyResponse("Leaderboard retrieved", {
     count,
diff --git a/backend/src/api/controllers/result.ts b/backend/src/api/controllers/result.ts
@@ -224,7 +224,7 @@ export async function addResult(
 
   const resulthash = completedEvent.hash;
   if (req.ctx.configuration.results.objectHashCheckEnabled) {
-    const objectToHash = omit(completedEvent, "hash");
+    const objectToHash = omit(completedEvent, ["hash"]);
     const serverhash = objectHash(objectToHash);
     if (serverhash !== resulthash) {
       void addLog(
diff --git a/backend/src/api/controllers/user.ts b/backend/src/api/controllers/user.ts
@@ -512,8 +512,7 @@ type RelevantUserInfo = Omit<
 >;
 
 function getRelevantUserInfo(user: UserDAL.DBUser): RelevantUserInfo {
-  return omit(
-    user,
+  return omit(user, [
     "bananas",
     "lbPersonalBests",
     "inbox",
@@ -524,8 +523,8 @@ function getRelevantUserInfo(user: UserDAL.DBUser): RelevantUserInfo {
     "note",
     "ips",
     "testActivity",
-    "suspicious"
-  ) as RelevantUserInfo;
+    "suspicious",
+  ]) as RelevantUserInfo;
 }
 
 export async function getUser(req: MonkeyRequest): Promise<GetUserResponse> {
diff --git a/backend/src/dal/leaderboards.ts b/backend/src/dal/leaderboards.ts
@@ -51,7 +51,7 @@ export async function get(
       .toArray();
 
     if (!premiumFeaturesEnabled) {
-      return result.map((it) => omit(it, "isPremium"));
+      return result.map((it) => omit(it, ["isPremium"]));
     }
 
     return result;
diff --git a/backend/src/dal/preset.ts b/backend/src/dal/preset.ts
@@ -61,7 +61,7 @@ export async function editPreset(
   uid: string,
   preset: EditPresetRequest
 ): Promise<void> {
-  const update: Partial<Omit<Preset, "_id">> = omit(preset, "_id");
+  const update: Partial<Omit<Preset, "_id">> = omit(preset, ["_id"]);
   if (
     preset.config === undefined ||
     preset.config === null ||
diff --git a/backend/src/init/configuration.ts b/backend/src/init/configuration.ts
@@ -14,6 +14,7 @@ import { join } from "path";
 import { existsSync, readFileSync } from "fs";
 import { parseWithSchema as parseJsonWithSchema } from "@monkeytype/util/json";
 import { z } from "zod";
+import { intersect } from "@monkeytype/util/arrays";
 
 const CONFIG_UPDATE_INTERVAL = 10 * 60 * 1000; // 10 Minutes
 const SERVER_CONFIG_FILE_PATH = join(
@@ -30,9 +31,7 @@ function mergeConfigurations(
   }
 
   function merge(base: object, source: object): void {
-    const baseKeys = Object.keys(base);
-    const sourceKeys = Object.keys(source);
-    const commonKeys = baseKeys.filter((key) => sourceKeys.includes(key));
+    const commonKeys = intersect(Object.keys(base), Object.keys(source), true);
 
     commonKeys.forEach((key) => {
       const baseValue = base[key] as object;
@@ -81,10 +80,9 @@ export async function getLiveConfiguration(): Promise<Configuration> {
     if (liveConfiguration) {
       const baseConfiguration = structuredClone(BASE_CONFIGURATION);
 
-      const liveConfigurationWithoutId = omit(
-        liveConfiguration,
-        "_id"
-      ) as Configuration;
+      const liveConfigurationWithoutId = omit(liveConfiguration, [
+        "_id",
+      ]) as Configuration;
       mergeConfigurations(baseConfiguration, liveConfigurationWithoutId);
 
       await pushConfiguration(baseConfiguration);
diff --git a/backend/src/init/redis.ts b/backend/src/init/redis.ts
@@ -4,6 +4,7 @@ import IORedis, { Redis } from "ioredis";
 import Logger from "../utils/logger";
 import { isDevEnvironment } from "../utils/misc";
 import { getErrorMessage } from "../utils/error";
+import { kebabToCamelCase } from "@monkeytype/util/strings";
 
 // Define Redis connection with custom methods for type safety
 export type RedisConnectionWithCustomMethods = Redis & {
@@ -49,14 +50,10 @@ const REDIS_SCRIPTS_DIRECTORY_PATH = join(__dirname, "../../redis-scripts");
 function loadScripts(client: IORedis.Redis): void {
   const scriptFiles = fs.readdirSync(REDIS_SCRIPTS_DIRECTORY_PATH);
 
-  const toCamelCase = (kebab: string): string => {
-    return kebab.replace(/-([a-z])/g, (_, char: string) => char.toUpperCase());
-  };
-
   scriptFiles.forEach((scriptFile) => {
     const scriptPath = join(REDIS_SCRIPTS_DIRECTORY_PATH, scriptFile);
     const scriptSource = fs.readFileSync(scriptPath, "utf-8");
-    const scriptName = toCamelCase(scriptFile.split(".")[0] as string);
+    const scriptName = kebabToCamelCase(scriptFile.split(".")[0] as string);
 
     client.defineCommand(scriptName, {
       lua: scriptSource,
diff --git a/backend/src/services/weekly-xp-leaderboard.ts b/backend/src/services/weekly-xp-leaderboard.ts
@@ -190,7 +190,7 @@ export class WeeklyXpLeaderboard {
     );
 
     if (!premiumFeaturesEnabled) {
-      return resultsWithRanks.map((it) => omit(it, "isPremium"));
+      return resultsWithRanks.map((it) => omit(it, ["isPremium"]));
     }
 
     return resultsWithRanks;
diff --git a/backend/src/utils/daily-leaderboards.ts b/backend/src/utils/daily-leaderboards.ts
@@ -166,7 +166,7 @@ export class DailyLeaderboard {
     );
 
     if (!premiumFeaturesEnabled) {
-      return resultsWithRanks.map((it) => omit(it, "isPremium"));
+      return resultsWithRanks.map((it) => omit(it, ["isPremium"]));
     }
 
     return resultsWithRanks;
diff --git a/backend/src/utils/misc.ts b/backend/src/utils/misc.ts
@@ -242,7 +242,7 @@ export type WithObjectId<T extends { _id: string }> = Omit<T, "_id"> & {
 
 export function omit<T extends object, K extends keyof T>(
   obj: T,
-  ...keys: K[]
+  keys: K[]
 ): Omit<T, K> {
   const result = { ...obj };
   for (const key of keys) {
diff --git a/packages/util/__test__/strings.spec.ts b/packages/util/__test__/strings.spec.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+import { kebabToCamelCase } from "../src/strings";
+
+describe("strings", () => {
+  describe("kebabToCamelCase", () => {
+    it("should convert kebab case to camel case", () => {
+      expect(kebabToCamelCase("hello-world")).toEqual("helloWorld");
+      expect(kebabToCamelCase("helloWorld")).toEqual("helloWorld");
+      expect(
+        kebabToCamelCase("one-two-three-four-five-six-seven-eight-nine-ten")
+      ).toEqual("oneTwoThreeFourFiveSixSevenEightNineTen");
+    });
+  });
+});
diff --git a/packages/util/src/strings.ts b/packages/util/src/strings.ts
@@ -0,0 +1,3 @@
+export function kebabToCamelCase(kebab: string): string {
+  return kebab.replace(/-([a-z])/g, (_, char: string) => char.toUpperCase());
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import { ApeKey } from "@monkeytype/schemas/ape-keys";`
`17`	`17`	`import { MonkeyRequest } from "../types";`
`18`	`18`
`19`	`19`	`function cleanApeKey(apeKey: ApeKeysDAL.DBApeKey): ApeKey {`
`20`		`- return omit(apeKey, "hash", "_id", "uid", "useCount") as ApeKey;`
	`20`	`+ return omit(apeKey, ["hash", "_id", "uid", "useCount"]) as ApeKey;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`export async function getApeKeys(`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export async function getLeaderboard(`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`const count = await LeaderboardsDAL.getCount(mode, mode2, language);`
`60`		`- const normalizedLeaderboard = leaderboard.map((it) => omit(it, "_id"));`
	`60`	`+ const normalizedLeaderboard = leaderboard.map((it) => omit(it, ["_id"]));`
`61`	`61`
`62`	`62`	`return new MonkeyResponse("Leaderboard retrieved", {`
`63`	`63`	`count,`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export async function get(`
`51`	`51`	`.toArray();`
`52`	`52`
`53`	`53`	`if (!premiumFeaturesEnabled) {`
`54`		`- return result.map((it) => omit(it, "isPremium"));`
	`54`	`+ return result.map((it) => omit(it, ["isPremium"]));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`return result;`