Connect, collaborate, and grow with a community of TypeScript developers
chore: refactor type checking (#674)
Anthony Morris7f00bbe4dbba
diff --git a/packages/monaco/src/editor-hooks.ts b/packages/monaco/src/editor-hooks.tsindex 205cd3dd..ba01cdf4 100644--- a/packages/monaco/src/editor-hooks.ts+++ b/packages/monaco/src/editor-hooks.ts@@ -8,11 +8,11 @@ class EditorEvents extends EventTarget {const event = new EditorEvents();type EventNames = 'resetCode';-export function useResetEditor(deps: unknown[] = []): {- subscribe: (eventName: EventNames, cb: () => void) => void;+export function useResetEditor(): {+ subscribe: (eventName: EventNames, cb: () => void, deps?: unknown[]) => void;dispatch: (eventName: EventNames) => void;} {- function subscribe(eventName: EventNames, cb: () => void) {+ function subscribe(eventName: EventNames, cb: () => void, deps: unknown[] = []) {useEffect(() => {const fnc = () => {cb();diff --git a/packages/monaco/src/split-editor.tsx b/packages/monaco/src/split-editor.tsxindex 86b32fa1..d796c2f2 100644--- a/packages/monaco/src/split-editor.tsx+++ b/packages/monaco/src/split-editor.tsx@@ -8,7 +8,7 @@ import { CodeEditor, LIB_URI } from './code-editor';import { libSource } from './editor-types';import dynamic from 'next/dynamic';import { useEditorSettingsStore } from './settings-store';-import { getEventDeltas } from './utils';+import { getEventDeltas, typeCheck } from './utils';import { useResetEditor } from './editor-hooks';function preventSelection(event: Event) {@@ -62,6 +62,7 @@ export default function SplitEditor({monaco,}: SplitEditorProps) {const { settings, updateSettings } = useEditorSettingsStore();+ const { subscribe } = useResetEditor();const wrapper = useRef<HTMLDivElement>(null);const resizer = useRef<HTMLDivElement>(null);@@ -178,44 +179,17 @@ export default function SplitEditor({}}}, [monaco]);- async function typeCheck() {- if (monaco && userEditorState) {- const models = monaco.editor.getModels();- const getWorker = await monaco.languages.typescript.getTypeScriptWorker();-- for (const model of models) {- const worker = await getWorker(model.uri);- const diagnostics = (- await Promise.all([- worker.getSyntacticDiagnostics(model.uri.toString()),- worker.getSemanticDiagnostics(model.uri.toString()),- ])- ).reduce((a, b) => a.concat(b));-- const markers = diagnostics.map((d) => {- const start = model.getPositionAt(d.start!);- const end = model.getPositionAt(d.start! + d.length!);-- return {- severity: monaco.MarkerSeverity.Error,- startLineNumber: start.lineNumber,- endLineNumber: end.lineNumber,- startColumn: start.column,- endColumn: end.column,- message: d.messageText as string,- } satisfies monacoType.editor.IMarkerData;- });-- monaco.editor.setModelMarkers(model, model.getLanguageId(), markers);++ subscribe(+ 'resetCode',+ () => {+ if (monaco && userEditorState) {+ typeCheck(monaco);+ onMount?.tests?.(userEditorState, monaco);}- }- }- useResetEditor([monaco, userEditorState]).subscribe('resetCode', () => {- if (monaco && userEditorState) {- typeCheck();- onMount?.tests?.(userEditorState, monaco);- }- });+ },+ [monaco, userEditorState],+ );return (<div className={clsx('flex h-[calc(100%-_90px)] flex-col', className)} ref={wrapper}>@@ -230,34 +204,7 @@ export default function SplitEditor({onValidate={onValidate?.user}onChange={async (e, a) => {if (monaco) {- const models = monaco.editor.getModels();- const getWorker = await monaco.languages.typescript.getTypeScriptWorker();-- for (const model of models) {- const worker = await getWorker(model.uri);- const diagnostics = (- await Promise.all([- worker.getSyntacticDiagnostics(model.uri.toString()),- worker.getSemanticDiagnostics(model.uri.toString()),- ])- ).reduce((a, b) => a.concat(b));-- const markers = diagnostics.map((d) => {- const start = model.getPositionAt(d.start!);- const end = model.getPositionAt(d.start! + d.length!);-- return {- severity: monaco.MarkerSeverity.Error,- startLineNumber: start.lineNumber,- endLineNumber: end.lineNumber,- startColumn: start.column,- endColumn: end.column,- message: d.messageText as string,- } satisfies monacoType.editor.IMarkerData;- });-- monaco.editor.setModelMarkers(model, model.getLanguageId(), markers);- }+ typeCheck(monaco);}onChange?.user?.(e, a);diff --git a/packages/monaco/src/utils.ts b/packages/monaco/src/utils.tsindex d7f662df..d39a9a5d 100644--- a/packages/monaco/src/utils.ts+++ b/packages/monaco/src/utils.ts@@ -1,3 +1,5 @@+import type * as MonacoEditor from 'monaco-editor';+export function getEventDeltas(e: MouseEvent | TouchEvent, origin: { x: number; y: number }) {if (e instanceof MouseEvent) {return {@@ -25,3 +27,34 @@ export function getEventDeltas(e: MouseEvent | TouchEvent, origin: { x: number;currPosY: touch.clientY,};}++export async function typeCheck(monaco: typeof MonacoEditor) {+ const models = monaco.editor.getModels();+ const getWorker = await monaco.languages.typescript.getTypeScriptWorker();++ for (const model of models) {+ const worker = await getWorker(model.uri);+ const diagnostics = (+ await Promise.all([+ worker.getSyntacticDiagnostics(model.uri.toString()),+ worker.getSemanticDiagnostics(model.uri.toString()),+ ])+ ).reduce((a, b) => a.concat(b));++ const markers = diagnostics.map((d) => {+ const start = model.getPositionAt(d.start!);+ const end = model.getPositionAt(d.start! + d.length!);++ return {+ severity: monaco.MarkerSeverity.Error,+ startLineNumber: start.lineNumber,+ endLineNumber: end.lineNumber,+ startColumn: start.column,+ endColumn: end.column,+ message: d.messageText as string,+ } satisfies MonacoEditor.editor.IMarkerData;+ });++ monaco.editor.setModelMarkers(model, model.getLanguageId(), markers);+ }+}