Merge branch 'monkeytypegame:master' into fix/profile-save-without-changes

Author: AzureNightlock

.github/pull_request_template.md

@@ -1,10 +1,21 @@
 ### Description
 
-<!-- Please describe the change(s) made in your PR -->
+<!-- 
+  Please describe the change(s) made in your PR:
+  - explain the problem being solved
+  - for bug fixes without an open issue, include steps to reproduce the issue
+  - summarize the approach taken
+  
+  Use your own words. Do not rely on AI-generated descriptions. 
+  They do not demonstrate your understanding of the problem or the solution.
+  Writing the description yourself helps you verify the scope of your work and 
+  helps us better understand your intent, reasoning and level of insight.
+-->
 
 ### Checks
 
 - [ ] Adding quotes?
+  - Make sure to follow the [quotes documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/QUOTES.md)
   - [ ] Make sure to include translations for the quotes in the description (or another comment) so we can verify their content.
 - [ ] Adding a language?
   - Make sure to follow the [languages documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LANGUAGES.md)
@@ -32,14 +43,13 @@
 
 <!-- label(optional scope): pull request title (@your_github_username) -->
 
-<!-- I know I know they seem boring but please do them, they help us and you will find out it also helps you.-->
+<!-- I know I know they seem boring but please do them, they help us and you will find out it also helps you. -->
 
 Closes #
 
-<!-- the issue(s) your PR resolves if any (delete if that is not the case) -->
-<!-- please also reference any issues and or PRs related to your pull request -->
-<!-- Also remove it if you are not following any issues. -->
+<!-- The issue(s) your PR resolves if any (delete if that is not the case) -->
+<!-- Please reference any issues and/or PRs related to your pull request -->
 
-<!-- pro tip: you can mention an issue, PR, or discussion on GitHub by referencing its hash number e.g: [#1234](https://github.com/monkeytypegame/monkeytype/pull/1234) -->
+<!-- Pro tip: you can mention an issue, PR, or discussion on GitHub by referencing its hash number, e.g.: [#1234](https://github.com/monkeytypegame/monkeytype/pull/1234) -->
 
-<!-- pro tip: you can press . (dot or period) in the code tab of any GitHub repo to get access to GitHub's VS Code web editor Enjoy! :) -->
+<!-- Pro tip: you can press . (dot or period) in the code tab of any GitHub repo to get access to GitHub's VS Code web editor. Enjoy! :) -->

backend/package.json

@@ -60,7 +60,7 @@
   "devDependencies": {
     "@monkeytype/oxlint-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
-    "@redocly/cli": "2.15.1",
+    "@redocly/cli": "2.24.1",
     "@types/bcrypt": "5.0.2",
     "@types/cors": "2.8.12",
     "@types/cron": "1.7.3",

frontend/__tests__/hooks/createEvent.spec.ts

@@ -1,46 +1,81 @@
 import { createRoot } from "solid-js";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { createEvent } from "../../src/ts/hooks/createEvent";
 
 describe("createEvent", () => {
-  it("initial value is 0", () => {
-    createRoot((dispose) => {
-      const [event] = createEvent();
-      expect(event()).toBe(0);
-      dispose();
-    });
+  it("dispatch notifies subscribers", () => {
+    const event = createEvent<string>();
+    const fn = vi.fn();
+    event.subscribe(fn);
+    event.dispatch("hello");
+    expect(fn).toHaveBeenCalledWith("hello");
   });
 
-  it("dispatch increments the value by 1", () => {
-    createRoot((dispose) => {
-      const [event, dispatch] = createEvent();
-      dispatch();
-      expect(event()).toBe(1);
-      dispose();
-    });
+  it("dispatch notifies multiple subscribers", () => {
+    const event = createEvent<number>();
+    const fn1 = vi.fn();
+    const fn2 = vi.fn();
+    event.subscribe(fn1);
+    event.subscribe(fn2);
+    event.dispatch(42);
+    expect(fn1).toHaveBeenCalledWith(42);
+    expect(fn2).toHaveBeenCalledWith(42);
   });
 
-  it("each dispatch increments independently", () => {
-    createRoot((dispose) => {
-      const [event, dispatch] = createEvent();
-      dispatch();
-      dispatch();
-      dispatch();
-      expect(event()).toBe(3);
-      dispose();
-    });
+  it("dispatch with no type arg requires no arguments", () => {
+    const event = createEvent();
+    const fn = vi.fn();
+    event.subscribe(fn);
+    event.dispatch();
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+
+  it("subscribe returns an unsubscribe function", () => {
+    const event = createEvent<string>();
+    const fn = vi.fn();
+    const unsub = event.subscribe(fn);
+    event.dispatch("a");
+    unsub();
+    event.dispatch("b");
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(fn).toHaveBeenCalledWith("a");
   });
 
   it("two independent events do not share state", () => {
+    const eventA = createEvent<string>();
+    const eventB = createEvent<string>();
+    const fnA = vi.fn();
+    const fnB = vi.fn();
+    eventA.subscribe(fnA);
+    eventB.subscribe(fnB);
+    eventA.dispatch("a");
+    expect(fnA).toHaveBeenCalledWith("a");
+    expect(fnB).not.toHaveBeenCalled();
+  });
+
+  it("useListener auto-unsubscribes on dispose", () => {
+    const event = createEvent<string>();
+    const fn = vi.fn();
     createRoot((dispose) => {
-      const [eventA, dispatchA] = createEvent();
-      const [eventB, dispatchB] = createEvent();
-      dispatchA();
-      dispatchA();
-      dispatchB();
-      expect(eventA()).toBe(2);
-      expect(eventB()).toBe(1);
+      event.useListener(fn);
+      event.dispatch("inside");
       dispose();
     });
+    event.dispatch("outside");
+    expect(fn).toHaveBeenCalledTimes(1);
+    expect(fn).toHaveBeenCalledWith("inside");
+  });
+
+  it("subscriber errors do not prevent other subscribers from running", () => {
+    const event = createEvent<string>();
+    const fn1 = vi.fn(() => {
+      throw new Error("oops");
+    });
+    const fn2 = vi.fn();
+    event.subscribe(fn1);
+    event.subscribe(fn2);
+    event.dispatch("test");
+    expect(fn1).toHaveBeenCalled();
+    expect(fn2).toHaveBeenCalled();
   });
 });

frontend/__tests__/root/config.spec.ts

@@ -12,7 +12,7 @@ import {
 } from "@monkeytype/schemas/configs";
 import * as FunboxValidation from "../../src/ts/config/funbox-validation";
 import * as ConfigValidation from "../../src/ts/config/validation";
-import * as ConfigEvent from "../../src/ts/observables/config-event";
+import { configEvent } from "../../src/ts/events/config";
 import * as ApeConfig from "../../src/ts/ape/config";
 import * as Notifications from "../../src/ts/states/notifications";
 const { replaceConfig, getConfig } = __testing;
@@ -33,7 +33,7 @@ describe("Config", () => {
       ConfigValidation,
       "isConfigValueValid",
     );
-    const dispatchConfigEventMock = vi.spyOn(ConfigEvent, "dispatch");
+    const dispatchConfigEventMock = vi.spyOn(configEvent, "dispatch");
     const dbSaveConfigMock = vi.spyOn(ApeConfig, "saveConfig");
     const notificationAddMock = vi.spyOn(
       Notifications,

frontend/package.json

@@ -115,7 +115,7 @@
     "tsx": "4.21.0",
     "typescript": "6.0.0-beta",
     "unplugin-inject-preload": "3.0.0",
-    "vite": "7.3.1",
+    "vite": "8.0.1",
     "vite-bundle-visualizer": "1.2.1",
     "vite-plugin-html-inject": "1.1.2",
     "vite-plugin-inspect": "11.3.3",

frontend/scripts/check-assets.ts

@@ -11,7 +11,6 @@ import {
   Language,
   LanguageObject,
   LanguageObjectSchema,
-  LanguageSchema,
 } from "@monkeytype/schemas/languages";
 import { Layout, ThemeName } from "@monkeytype/schemas/configs";
 import { LayoutsList } from "../src/ts/constants/layouts";
@@ -154,7 +153,7 @@ async function validateQuotes(): Promise<void> {
 
   const shortQuotes = JSON.parse(
     fs.readFileSync("./scripts/short-quotes.json", "utf8"),
-  ) as Partial<Record<QuoteData["language"], number[]>>;
+  ) as Record<QuoteData["language"], number[]>;
 
   const quotesFiles = fs.readdirSync("./static/quotes/");
   for (let quotefilename of quotesFiles) {
@@ -185,12 +184,7 @@ async function validateQuotes(): Promise<void> {
     }
 
     //check schema
-    const schema = QuoteDataSchema.extend({
-      language: LanguageSchema
-        //icelandic only exists as icelandic_1k, language in quote file is stripped of its size
-        .or(z.literal("icelandic")),
-    });
-    problems.addValidation(quotefilename, schema.safeParse(quoteData));
+    problems.addValidation(quotefilename, QuoteDataSchema.safeParse(quoteData));
 
     //check for duplicate ids
     const duplicates = findDuplicates(quoteData.quotes.map((it) => it.id));

frontend/scripts/get-short-quotes.ts

@@ -1,26 +1,38 @@
-import * as fs from "fs";
 import { QuoteData } from "@monkeytype/schemas/quotes";
+import * as fs from "fs";
+
+import path, { dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const FRONTEND_ROOT = path.resolve(__dirname, "..");
 
 async function getShortQuotes(): Promise<void> {
-  let shortQuotes: Partial<Record<QuoteData["language"], number[]>> = {};
+  const shortQuotes = {} as Record<QuoteData["language"], number[]>;
   let count = 0;
-  const quotesFiles = fs.readdirSync("./static/quotes/");
+  const quotesFiles = fs.readdirSync(
+    path.resolve(FRONTEND_ROOT, "static/quotes"),
+  );
   for (const quotefilename of quotesFiles) {
-    const lang = quotefilename.split(".")[0] as QuoteData["language"];
-    let quoteData: QuoteData;
-    let quoteJson: string;
-    quoteJson = fs.readFileSync(`./static/quotes/${lang}.json`, "utf8");
-    //quoteJson = await (await fetch(`https://raw.githubusercontent.com/monkeytypegame/monkeytype/refs/heads/master/frontend/static/quotes/${lang}.json`)).json();
-    quoteData = JSON.parse(quoteJson) as QuoteData;
+    const quoteJson = fs.readFileSync(
+      path.resolve(FRONTEND_ROOT, `static/quotes/${quotefilename}`),
+      "utf8",
+    );
+    //const quoteJson = await (await fetch(`https://raw.githubusercontent.com/monkeytypegame/monkeytype/refs/heads/master/frontend/static/quotes/${quotefilename}`)).json();
+    const quoteData = JSON.parse(quoteJson) as QuoteData;
     for (const quote of quoteData.quotes) {
       if (quote.length < 60) {
-        shortQuotes[lang] ??= [];
-        shortQuotes[lang].push(quote.id);
+        shortQuotes[quoteData.language] ??= [];
+        shortQuotes[quoteData.language].push(quote.id);
         count++;
       }
     }
   }
-  fs.writeFileSync("./scripts/short-quotes.json", JSON.stringify(shortQuotes));
+  fs.writeFileSync(
+    path.resolve(__dirname, "short-quotes.json"),
+    JSON.stringify(shortQuotes),
+  );
   console.log(`There are ${count} allowed short quotes`);
 }
 

frontend/scripts/import-tree.ts

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import ts from "typescript";
 
 const ROOT = path.resolve(import.meta.dirname, "..");
 
@@ -34,8 +35,11 @@ function collectTsFiles(dir: string): string[] {
   return results;
 }
 
+const isDir = fs.statSync(resolved).isDirectory();
+const boundary = isDir ? resolved : null;
+
 let entryPoints: string[];
-if (fs.statSync(resolved).isDirectory()) {
+if (isDir) {
   entryPoints = collectTsFiles(resolved);
 } else {
   entryPoints = [resolved];
@@ -46,15 +50,35 @@ if (entryPoints.length === 0) {
   process.exit(1);
 }
 
-// --- Import extraction ---
+// --- Import extraction (type-aware) ---
+
+const tsConfig: ts.CompilerOptions = {
+  module: ts.ModuleKind.ESNext,
+  target: ts.ScriptTarget.ESNext,
+  jsx: ts.JsxEmit.Preserve,
+  sourceMap: false,
+  declaration: false,
+  isolatedModules: true,
+};
 
-const IMPORT_RE =
-  /(?:import|export)\s+(?:type\s+)?(?:(?:\{[^}]*\}|[\w*]+(?:\s*,\s*\{[^}]*\})?)\s+from\s+)?["']([^"']+)["']/g;
+const JS_IMPORT_RE =
+  /(?:import|export)\s+(?:(?:\{[^}]*\}|[\w*]+(?:\s*,\s*\{[^}]*\})?)\s+from\s+)?["']([^"']+)["']/g;
 
 function extractImports(filePath: string): string[] {
   const content = fs.readFileSync(filePath, "utf-8");
+  let outputText: string;
+  try {
+    ({ outputText } = ts.transpileModule(content, {
+      compilerOptions: tsConfig,
+      fileName: filePath,
+    }));
+  } catch {
+    // Some files (e.g. declaration files) can't be transpiled — fall back to
+    // regex on the original source, which still strips type-only imports.
+    outputText = content;
+  }
   const specifiers: string[] = [];
-  for (const match of content.matchAll(IMPORT_RE)) {
+  for (const match of outputText.matchAll(JS_IMPORT_RE)) {
     const spec = match[1];
     if (spec !== undefined) specifiers.push(spec);
   }
@@ -190,6 +214,12 @@ function depthColor(depth: number): string {
 
 // --- Display ---
 
+function leavesFolder(filePath: string): boolean {
+  if (boundary === null) return false;
+  if (filePath.startsWith("@monkeytype/")) return true;
+  return !filePath.startsWith(boundary + "/");
+}
+
 function displayPath(filePath: string): string {
   if (filePath.startsWith(ROOT + "/")) {
     return path.relative(ROOT, filePath);
@@ -210,9 +240,12 @@ function printTree(
   const connector = isRoot ? "" : isLast ? "└── " : "├── ";
   const dc = depthColor(depth);
 
+  const leaves = !isRoot && leavesFolder(filePath);
+  const leavesTag = leaves ? ` ${c.red}[↑]${c.reset}` : "";
+
   if (!info) {
     // leaf node (e.g. @monkeytype package)
-    console.log(`${c.dim}${prefix}${connector}${dp}${c.reset}`);
+    console.log(`${c.dim}${prefix}${connector}${dp}${c.reset}${leavesTag}`);
     return;
   }
 
@@ -225,7 +258,7 @@ function printTree(
   const seen = !isRoot && printed.has(filePath);
   const seenTag = seen ? ` ${c.dim}[seen above]${c.reset}` : "";
   console.log(
-    `${c.dim}${prefix}${connector}${c.reset}${nameStyle}${dp}${c.reset}${stats}${seenTag}`,
+    `${c.dim}${prefix}${connector}${c.reset}${nameStyle}${dp}${c.reset}${stats}${leavesTag}${seenTag}`,
   );
 
   if (seen || depth >= maxDepthLimit) return;
@@ -336,3 +369,21 @@ console.log(
 console.log(
   `Max depth:          ${c.bold}${maxDepthSeen}${c.reset} ${c.dim}(${displayPath(maxDepthFile)})${c.reset}`,
 );
+
+if (boundary !== null) {
+  const externalDirect = new Set<string>();
+  const externalTransitive = new Set<string>();
+  for (const entry of entryPoints) {
+    const info = cache.get(entry);
+    if (!info) continue;
+    for (const dep of info.directImports) {
+      if (leavesFolder(dep)) externalDirect.add(dep);
+    }
+    for (const dep of getAllReachable(entry, new Set())) {
+      if (leavesFolder(dep)) externalTransitive.add(dep);
+    }
+  }
+  console.log(
+    `Leaves folder ${c.red}[↑]${c.reset}: ${c.bold}${externalDirect.size}${c.reset} direct, ${c.bold}${externalTransitive.size}${c.reset} transitive`,
+  );
+}