Merge branch 'master' into quote-favorite

Author: Leonabcd123

…tend/__tests__/utils/url-handler.spec.ts …_tests__/controllers/url-handler.spec.tsfrontend/__tests__/utils/url-handler.spec.ts renamed to frontend/__tests__/controllers/url-handler.spec.ts frontend/__tests__/utils/url-handler.spec.ts renamed to frontend/__tests__/controllers/url-handler.spec.ts

@@ -6,9 +6,9 @@ import * as Notifications from "../../src/ts/stores/notifications";
 import * as TestLogic from "../../src/ts/test/test-logic";
 import * as TestState from "../../src/ts/test/test-state";
 import * as Misc from "../../src/ts/utils/misc";
-import { loadTestSettingsFromUrl } from "../../src/ts/utils/url-handler";
 import { FunboxName } from "@monkeytype/schemas/configs";
 import { CustomTextSettings } from "@monkeytype/schemas/results";
+import { loadTestSettingsFromUrl } from "../../src/ts/controllers/url-handler";
 
 //mock modules to avoid dependencies
 vi.mock("../../src/ts/test/test-logic", () => ({

frontend/__tests__/root/config.spec.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeEach, afterAll, vi } from "vitest";
 import * as Config from "../../src/ts/config";
 import * as Misc from "../../src/ts/utils/misc";
+import * as Env from "../../src/ts/utils/env";
 import {
   ConfigKey,
   Config as ConfigType,
@@ -14,7 +15,7 @@ import * as Notifications from "../../src/ts/stores/notifications";
 const { replaceConfig, getConfig } = Config.__testing;
 
 describe("Config", () => {
-  const isDevEnvironmentMock = vi.spyOn(Misc, "isDevEnvironment");
+  const isDevEnvironmentMock = vi.spyOn(Env, "isDevEnvironment");
   beforeEach(() => {
     isDevEnvironmentMock.mockClear();
     replaceConfig({});

frontend/__tests__/utils/misc.spec.ts

@@ -1,6 +1,5 @@
 import { describe, it, expect, vi } from "vitest";
 import {
-  getErrorMessage,
   isObject,
   escapeHTML,
   promiseWithResolvers,
@@ -10,6 +9,7 @@ import {
   removeLanguageSize,
 } from "../../src/ts/utils/strings";
 import { Language } from "@monkeytype/schemas/languages";
+import { getErrorMessage } from "../../src/ts/utils/error";
 
 describe("misc.ts", () => {
   describe("getLanguageDisplayString", () => {

frontend/package.json

@@ -48,7 +48,7 @@
     "chart.js": "3.7.1",
     "chartjs-adapter-date-fns": "3.0.0",
     "chartjs-plugin-annotation": "2.2.1",
-    "chartjs-plugin-trendline": "1.0.2",
+    "chartjs-plugin-trendline": "3.2.0",
     "clsx": "2.1.1",
     "color-blend": "4.0.0",
     "damerau-levenshtein": "1.0.8",

frontend/scripts/import-tree.ts

@@ -282,3 +282,57 @@ for (const entry of entryPoints) {
   printTree(entry, new Set([entry]), "", true, true);
   if (entryPoints.length > 1) console.log();
 }
+
+// --- Summary ---
+
+let totalDirect = 0;
+let totalTransitive = 0;
+const uniqueDirect = new Set<string>();
+const uniqueTransitive = new Set<string>();
+let maxDirect = 0;
+let maxDirectFile = "";
+let maxTransitive = 0;
+let maxTransitiveFile = "";
+let maxDepthSeen = 0;
+let maxDepthFile = "";
+
+for (const entry of entryPoints) {
+  const info = cache.get(entry);
+  if (!info) continue;
+  totalDirect += info.directImports.length;
+  totalTransitive += info.totalReachable;
+  for (const dep of info.directImports) {
+    uniqueDirect.add(dep);
+  }
+  for (const dep of getAllReachable(entry, new Set())) {
+    uniqueTransitive.add(dep);
+  }
+  if (info.directImports.length > maxDirect) {
+    maxDirect = info.directImports.length;
+    maxDirectFile = entry;
+  }
+  if (info.totalReachable > maxTransitive) {
+    maxTransitive = info.totalReachable;
+    maxTransitiveFile = entry;
+  }
+  if (info.maxDepth > maxDepthSeen) {
+    maxDepthSeen = info.maxDepth;
+    maxDepthFile = entry;
+  }
+}
+
+console.log(`${c.dim}───────────────────────────${c.reset}`);
+console.log(`Target:             ${c.bold}${displayPath(resolved)}${c.reset}`);
+console.log(`Total direct:       ${c.bold}${totalDirect}${c.reset}`);
+console.log(`Total transitive:   ${c.bold}${totalTransitive}${c.reset}`);
+console.log(`Unique direct:      ${c.bold}${uniqueDirect.size}${c.reset}`);
+console.log(`Unique transitive:  ${c.bold}${uniqueTransitive.size}${c.reset}`);
+console.log(
+  `Max direct:         ${c.bold}${maxDirect}${c.reset} ${c.dim}(${displayPath(maxDirectFile)})${c.reset}`,
+);
+console.log(
+  `Max transitive:     ${c.bold}${maxTransitive}${c.reset} ${c.dim}(${displayPath(maxTransitiveFile)})${c.reset}`,
+);
+console.log(
+  `Max depth:          ${c.bold}${maxDepthSeen}${c.reset} ${c.dim}(${displayPath(maxDepthFile)})${c.reset}`,
+);

frontend/src/ts/auth.tsx

@@ -32,7 +32,7 @@ import {
   showErrorNotification,
   showSuccessNotification,
 } from "./stores/notifications";
-import { createErrorMessage } from "./utils/misc";
+import { createErrorMessage } from "./utils/error";
 
 export const gmailProvider = new GoogleAuthProvider();
 export const githubProvider = new GithubAuthProvider();

frontend/src/ts/commandline/commandline-metadata.ts

@@ -8,12 +8,12 @@ import * as ManualRestart from "../test/manual-restart-tracker";
 import { areUnsortedArraysEqual } from "../utils/arrays";
 import Config from "../config";
 import { get as getTypingSpeedUnit } from "../utils/typing-speed-units";
-import { Validation } from "../elements/input-validation";
 import { getActivePage } from "../signals/core";
 import { Fonts } from "../constants/fonts";
 import { KnownFontName } from "@monkeytype/schemas/fonts";
 import * as UI from "../ui";
 import { typedKeys } from "../utils/misc";
+import { Validation } from "../types/validation";
 
 type ConfigKeysWithoutCommands =
   | "minWpmCustomSpeed"

frontend/src/ts/commandline/commandline.ts

@@ -18,10 +18,7 @@ import { areSortedArraysEqual, areUnsortedArraysEqual } from "../utils/arrays";
 import { parseIntOptional } from "../utils/numbers";
 import { debounce } from "throttle-debounce";
 import { intersect } from "@monkeytype/util/arrays";
-import {
-  createInputEventHandler,
-  ValidationResult,
-} from "../elements/input-validation";
+import { createInputEventHandler } from "../elements/input-validation";
 import { isInputElementFocused } from "../input/input-element";
 import { qs } from "../utils/dom";
 import { ConfigKey } from "@monkeytype/schemas/configs";
@@ -32,6 +29,7 @@ import {
   hideModalAndClearChain as storeClearChain,
   isModalOpen,
 } from "../stores/modals";
+import { ValidationResult } from "../types/validation";
 
 type CommandlineMode = "search" | "input";
 type InputModeParams = {
@@ -125,7 +123,7 @@ export function show(
           if (exists) {
             showLoaderBar();
             subgroupOverride = await CommandlineLists.getList(
-              overrideStringOrGroup,
+              overrideStringOrGroup as CommandlineLists.ListsObjectKeys,
             );
             hideLoaderBar();
           } else {

frontend/src/ts/commandline/lists.ts

@@ -17,7 +17,7 @@ import LoadChallengeCommands, {
 } from "./lists/load-challenge";
 
 import Config, { applyConfigFromJson, setConfig } from "../config";
-import * as Misc from "../utils/misc";
+import * as getErrorMessage from "../utils/error";
 import * as JSONData from "../utils/json-data";
 import { randomizeTheme } from "../controllers/theme-controller";
 import * as CustomTextPopup from "../modals/custom-text";
@@ -47,7 +47,10 @@ challengesPromise
   })
   .catch((e: unknown) => {
     console.error(
-      Misc.createErrorMessage(e, "Failed to update challenges commands"),
+      getErrorMessage.createErrorMessage(
+        e,
+        "Failed to update challenges commands",
+      ),
     );
   });
 

frontend/src/ts/commandline/lists/themes.ts

@@ -5,7 +5,7 @@ import { Command, CommandsSubgroup } from "../types";
 import { ThemesList, ThemeWithName } from "../../constants/themes";
 import { not } from "@monkeytype/util/predicates";
 import * as ConfigEvent from "../../observables/config-event";
-import * as Misc from "../../utils/misc";
+import * as getErrorMessage from "../../utils/error";
 
 const isFavorite = (theme: ThemeWithName): boolean =>
   Config.favThemes.includes(theme.name);
@@ -83,7 +83,10 @@ ConfigEvent.subscribe(({ key }) => {
       update(ThemesList);
     } catch (e: unknown) {
       console.error(
-        Misc.createErrorMessage(e, "Failed to update themes commands"),
+        getErrorMessage.createErrorMessage(
+          e,
+          "Failed to update themes commands",
+        ),
       );
     }
   }