Merge branch 'master' into feature/solid-results

Author: fehmer

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

@@ -10,9 +10,9 @@ import {
   Config as ConfigType,
   CaretStyleSchema,
 } from "@monkeytype/schemas/configs";
-import * as FunboxValidation from "../../src/ts/test/funbox/funbox-validation";
+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/__tests__/test/funbox/funbox-validation.spec.ts

@@ -1,27 +1,18 @@
-import { describe, it, expect, afterEach, vi } from "vitest";
-import { canSetConfigWithCurrentFunboxes } from "../../../src/ts/test/funbox/funbox-validation";
+import { describe, it, expect } from "vitest";
+import { canSetConfigWithCurrentFunboxes } from "../../../src/ts/config/funbox-validation";
 
-import * as Notifications from "../../../src/ts/states/notifications";
 import { FunboxName } from "@monkeytype/schemas/configs";
 describe("funbox-validation", () => {
   describe("canSetConfigWithCurrentFunboxes", () => {
-    const addNotificationMock = vi.spyOn(
-      Notifications,
-      "showNoticeNotification",
-    );
-    afterEach(() => {
-      addNotificationMock.mockClear();
-    });
-
     const testCases = [
       //checks for frontendForcedConfig
       {
         key: "mode",
         value: "zen",
         funbox: ["memory"],
-        error: "You can't set mode to zen with currently active funboxes.",
+        expected: false,
       },
-      { key: "mode", value: "words", funbox: ["memory"] }, //ok
+      { key: "mode", value: "words", funbox: ["memory"], expected: true },
 
       //checks for zen mode
       ...[
@@ -40,10 +31,15 @@ describe("funbox-validation", () => {
         key: "mode",
         value: "zen",
         funbox: [funbox],
-        error: "You can't set mode to zen with currently active funboxes.",
+        expected: false,
       })),
-      { key: "mode", value: "zen", funbox: ["mirror"] }, //ok
-      { key: "mode", value: "zen", funbox: ["space_balls"] }, //no frontendFunctions
+      { key: "mode", value: "zen", funbox: ["mirror"], expected: true },
+      {
+        key: "mode",
+        value: "zen",
+        funbox: ["space_balls"],
+        expected: true,
+      },
 
       //checks for words and custom
       ...["quote", "custom"].flatMap((value) =>
@@ -56,23 +52,22 @@ describe("funbox-validation", () => {
           key: "mode",
           value,
           funbox: [funbox],
-          error: `You can't set mode to ${value} with currently active funboxes.`,
+          expected: false,
         })),
       ),
-      { key: "mode", value: "quote", funbox: ["space_balls"] }, //no frontendFunctions
+      {
+        key: "mode",
+        value: "quote",
+        funbox: ["space_balls"],
+        expected: true,
+      },
     ];
     it.for(testCases)(
       `check $funbox with $key=$value`,
-      ({ key, value, funbox, error }) => {
+      ({ key, value, funbox, expected }) => {
         expect(
           canSetConfigWithCurrentFunboxes(key, value, funbox as FunboxName[]),
-        ).toBe(error === undefined);
-
-        if (error !== undefined) {
-          expect(addNotificationMock).toHaveBeenCalledWith(error, {
-            durationMs: 5000,
-          });
-        }
+        ).toBe(expected);
       },
     );
   });

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/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`,
+  );
+}

frontend/src/terms-of-service.html

@@ -211,26 +211,28 @@ <h1>Limitations</h1>
           Users as a whole.
         </p>
         <h1>Privacy Policy</h1>
-        If you use our Services, you must abide by our Privacy Policy. You
-        acknowledge that you have read our
-        <a
-          href="https://monkeytype.com/privacy-policy"
-          target="_blank"
-          rel="noreferrer noopener"
-        >
-          Privacy Policy
-        </a>
-        &nbsp;and understand that it sets forth how we collect, use, and store
-        your information. If you do not agree with our Privacy Statement, then
-        you must stop using the Services immediately. Any person, entity, or
-        service collecting data from the Services must comply with our Privacy
-        Statement. Misuse of any User's Personal Information is prohibited. If
-        you collect any Personal Information from a User, you agree that you
-        will only use the Personal Information you gather for the purpose for
-        which the User has authorized it. You agree that you will reasonably
-        secure any Personal Information you have gathered from the Services, and
-        you will respond promptly to complaints, removal requests, and 'do not
-        contact' requests from us or Users.
+        <div>
+          If you use our Services, you must abide by our Privacy Policy. You
+          acknowledge that you have read our
+          <a
+            href="https://monkeytype.com/privacy-policy"
+            target="_blank"
+            rel="noreferrer noopener"
+          >
+            Privacy Policy
+          </a>
+          &nbsp;and understand that it sets forth how we collect, use, and store
+          your information. If you do not agree with our Privacy Statement, then
+          you must stop using the Services immediately. Any person, entity, or
+          service collecting data from the Services must comply with our Privacy
+          Statement. Misuse of any User's Personal Information is prohibited. If
+          you collect any Personal Information from a User, you agree that you
+          will only use the Personal Information you gather for the purpose for
+          which the User has authorized it. You agree that you will reasonably
+          secure any Personal Information you have gathered from the Services,
+          and you will respond promptly to complaints, removal requests, and 'do
+          not contact' requests from us or Users.
+        </div>
 
         <h1>Limitations on Automated Use</h1>
         You shouldn't use bots or access our Services in malicious or prohibited