Merge pull request #109 from Digital-Alchemy-TS/typeStability

Type stability

Author: chrisdrackett

apps/client/package.json

@@ -16,10 +16,10 @@
   },
   "dependencies": {
     "@code-glue/paradigm": "workspace:^",
-    "@monaco-editor/react": "^4.7.0",
+    "@monaco-editor/react": "4.7.0",
     "@tiltshift/valtio-factory": "2.0.3",
-    "@typescript/ata": "^0.9.8",
-    "monaco-editor": "^0.54.0",
+    "@typescript/ata": "0.9.8",
+    "monaco-editor": "0.55.1",
     "monaco-prettier": "^1.0.0",
     "nuqs": "^2.8.3",
     "prettier": "^3.7.4",

apps/client/src/components/Editor/index.tsx

@@ -96,6 +96,10 @@ export const Editor: React.FC = () => {
 					automaticLayout: true,
 					occurrencesHighlight: "off",
 					scrollBeyondLastLine: false,
+					quickSuggestions: {
+						strings: true,
+					},
+					codeLens: false,
 				},
 
 				...(path && { path }),

apps/client/src/components/Editor/init.ts

@@ -7,7 +7,7 @@ import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker"
 import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker"
 import { configureMonacoPrettier } from "monaco-prettier"
 import { createHighlighter } from "shiki"
-import ts from "typescript"
+import * as ts from "typescript"
 import { subscribe } from "valtio"
 
 import { appConfig } from "@/config"
@@ -32,10 +32,10 @@ self.MonacoEnvironment = {
 }
 
 // # Configure TypeScript compiler options
-monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
-	target: monaco.languages.typescript.ScriptTarget.Latest,
-	moduleResolution: monaco.languages.typescript.ModuleResolutionKind.NodeJs,
-	module: monaco.languages.typescript.ModuleKind.CommonJS,
+monaco.typescript.typescriptDefaults.setCompilerOptions({
+	target: monaco.typescript.ScriptTarget.Latest,
+	moduleResolution: monaco.typescript.ModuleResolutionKind.NodeJs,
+	module: monaco.typescript.ModuleKind.CommonJS,
 	moduleDetection: 3, // Allow automations to have the same var names without TS complaining. https://github.com/microsoft/monaco-editor/issues/2976
 	allowNonTsExtensions: true,
 	allowSyntheticDefaultImports: true,
@@ -85,7 +85,7 @@ const unsubscribe = subscribe(store.apiStatus, () => {
 		const editorSupport = store.editorSupport
 		const header = editorSupport.automationHeader
 
-		monaco.languages.typescript.typescriptDefaults.addExtraLib(
+		monaco.typescript.typescriptDefaults.addExtraLib(
 			`${header}`,
 			"file:///globals.ts",
 		)
@@ -116,10 +116,7 @@ const unsubscribe = subscribe(store.apiStatus, () => {
 								break
 						}
 
-						monaco.languages.typescript.typescriptDefaults.addExtraLib(
-							code,
-							filePath,
-						)
+						monaco.typescript.typescriptDefaults.addExtraLib(code, filePath)
 					},
 				},
 				fetcher: async (url) => {
@@ -158,6 +155,23 @@ const unsubscribe = subscribe(store.apiStatus, () => {
 	}
 })
 
+// Prevent Monaco from auto-creating models when navigating to type definitions
+// This is a workaround for https://github.com/microsoft/monaco-editor/issues/2813
+const originalCreateModel = monaco.editor.createModel
+monaco.editor.createModel = function (value, language, uri, ...args) {
+	// If Monaco tries to create a model for a file we've already added as extraLib, skip it
+	if (uri?.path.includes("node_modules")) {
+		/**
+		 * We return null here instead of an empty model because
+		 * this way monaco will remove the peak and goto definition links entirely.
+		 * If an empty model is provided, these links exist, but go to a blank file.
+		 */
+		// biome-ignore lint/suspicious/noExplicitAny: while types say you can't create a model this way, it works and provides the best possible UI.
+		return null as any
+	}
+	return originalCreateModel.call(this, value, language, uri, ...args)
+}
+
 // Load Monaco via the loader
 loader.config({ monaco })
 loader.init()

yarn.lock

@@ -582,15 +582,15 @@ __metadata:
   dependencies:
     "@biomejs/biome": "npm:2.3.5"
     "@code-glue/paradigm": "workspace:^"
-    "@monaco-editor/react": "npm:^4.7.0"
+    "@monaco-editor/react": "npm:4.7.0"
     "@shikijs/monaco": "npm:^3.19.0"
     "@tiltshift/valtio-factory": "npm:2.0.3"
     "@types/node": "npm:^22.10.2"
     "@types/react": "npm:^19.2.0"
     "@types/react-dom": "npm:^19.2.0"
-    "@typescript/ata": "npm:^0.9.8"
+    "@typescript/ata": "npm:0.9.8"
     "@vitejs/plugin-react": "npm:^5.0.4"
-    monaco-editor: "npm:^0.54.0"
+    monaco-editor: "npm:0.55.1"
     monaco-prettier: "npm:^1.0.0"
     nuqs: "npm:^2.8.3"
     prettier: "npm:^3.7.4"
@@ -2646,7 +2646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@monaco-editor/react@npm:^4.7.0":
+"@monaco-editor/react@npm:4.7.0":
   version: 4.7.0
   resolution: "@monaco-editor/react@npm:4.7.0"
   dependencies:
@@ -5668,6 +5668,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/trusted-types@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@types/trusted-types@npm:2.0.7"
+  checksum: 10/8e4202766a65877efcf5d5a41b7dd458480b36195e580a3b1085ad21e948bc417d55d6f8af1fd2a7ad008015d4117d5fdfe432731157da3c68678487174e4ba3
+  languageName: node
+  linkType: hard
+
 "@types/unist@npm:*, @types/unist@npm:^3.0.0":
   version: 3.0.3
   resolution: "@types/unist@npm:3.0.3"
@@ -5939,7 +5946,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript/ata@npm:^0.9.8":
+"@typescript/ata@npm:0.9.8":
   version: 0.9.8
   resolution: "@typescript/ata@npm:0.9.8"
   peerDependencies:
@@ -7822,10 +7829,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:3.1.7":
-  version: 3.1.7
-  resolution: "dompurify@npm:3.1.7"
-  checksum: 10/dc637a064306f83cf911caa267ffe1f973552047602020e3b6723c90f67962813edf8a65a0b62e8c9bc13fcd173a2691212a3719bc116226967f46bcd6181277
+"dompurify@npm:3.2.7":
+  version: 3.2.7
+  resolution: "dompurify@npm:3.2.7"
+  dependencies:
+    "@types/trusted-types": "npm:^2.0.7"
+  dependenciesMeta:
+    "@types/trusted-types":
+      optional: true
+  checksum: 10/51b7866fb834ee62d6c415f41ece5ce11db7b463f60a822932a1f832573a40b98be7715550298690e7647988fbe086db1098bda9b10548b3166fc975eb9bd849
   languageName: node
   linkType: hard
 
@@ -11996,13 +12008,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"monaco-editor@npm:^0.54.0":
-  version: 0.54.0
-  resolution: "monaco-editor@npm:0.54.0"
+"monaco-editor@npm:0.55.1":
+  version: 0.55.1
+  resolution: "monaco-editor@npm:0.55.1"
   dependencies:
-    dompurify: "npm:3.1.7"
+    dompurify: "npm:3.2.7"
     marked: "npm:14.0.0"
-  checksum: 10/654aa19e8ed859627f8c545026e41955fd015eeac4a26330a5176b955e0afbcd590bbfba06fa9f22fa1bc97d7a33100059e26c754f9541b64d753379a6396711
+  checksum: 10/73836b612a923342001b8cbb459aad0de486c94672fb7cf9d28bdafed9f3b7523d5aba510d9f8e7d24476a5aacf0d3a5c0cdc520ed4764f6f89f8cf5ba8d9329
   languageName: node
   linkType: hard