Connect, collaborate, and grow with a community of TypeScript developers
Trash/ata alt (#916)
bautistaaaaa1039e7cc3b
diff --git a/packages/monaco/package.json b/packages/monaco/package.jsonindex e589ef12..85ff896e 100644--- a/packages/monaco/package.json+++ b/packages/monaco/package.json@@ -52,7 +52,9 @@"@monaco-editor/loader": "^1.3.3","@monaco-editor/react": "^4.5.1","@repo/ui": "workspace:^",+ "@typescript/ata": "^0.9.4","clsx": "^2.0.0",+ "lodash": "^4.17.21","lz-string": "^1.5.0","monaco-vim": "^0.4.0","next": "^13.5.4",diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsxindex aecb9ae4..7af8b50b 100644--- a/packages/monaco/src/index.tsx+++ b/packages/monaco/src/index.tsx@@ -11,9 +11,7 @@ import type * as monaco from 'monaco-editor';import { usePathname, useSearchParams } from 'next/navigation';import React, { useState } from 'react';import { useResetEditor } from './editor-hooks';-import { PrettierFormatProvider } from './prettier';import SplitEditor, { TESTS_PATH, USER_CODE_PATH } from './split-editor';-import { createTwoslashInlayProvider } from './twoslash';import { useLocalStorage } from './useLocalStorage';export interface CodePanelProps {@@ -118,10 +116,10 @@ export function CodePanel(props: CodePanelProps) {tests: async (editor, monaco) => {const getTsWorker = await monaco.languages.typescript.getTypeScriptWorker();- const mm = monaco.editor.getModel(monaco.Uri.parse(TESTS_PATH));- if (!mm) return null;+ const model = monaco.editor.getModel(monaco.Uri.parse(TESTS_PATH));+ if (!model) return null;- const tsWorker = await getTsWorker(mm.uri);+ const tsWorker = await getTsWorker(model.uri);const errors = await Promise.all([tsWorker.getSemanticDiagnostics(TESTS_PATH),tsWorker.getSyntacticDiagnostics(TESTS_PATH),@@ -133,66 +131,59 @@ export function CodePanel(props: CodePanelProps) {},user: async (editor, monaco) => {setMonacoInstance(monaco);-- monaco.languages.typescript.typescriptDefaults.setCompilerOptions({- ...monaco.languages.typescript.typescriptDefaults.getCompilerOptions(),- strict: true,- target: monaco.languages.typescript.ScriptTarget.ESNext,- strictNullChecks: true,- });-- monaco.languages.registerDocumentFormattingEditProvider(- 'typescript',- PrettierFormatProvider,- );-setUserEditorState(editor);- const model = editor.getModel();+ const getTsWorker = await monaco.languages.typescript.getTypeScriptWorker();+ const model = monaco.editor.getModel(monaco.Uri.parse(USER_CODE_PATH));if (!model) {throw new Error();}- const ts = await (await monaco.languages.typescript.getTypeScriptWorker())(model.uri);-- const userErrors = await Promise.all([- ts.getSemanticDiagnostics(USER_CODE_PATH),- ts.getSyntacticDiagnostics(USER_CODE_PATH),- ts.getCompilerOptionsDiagnostics(USER_CODE_PATH),- ] as const);+ const tsWorker = await getTsWorker(model.uri);const testErrors = await Promise.all([- ts.getSemanticDiagnostics(TESTS_PATH),- ts.getSyntacticDiagnostics(TESTS_PATH),- ts.getCompilerOptionsDiagnostics(TESTS_PATH),+ tsWorker.getSemanticDiagnostics(USER_CODE_PATH),+ tsWorker.getSyntacticDiagnostics(USER_CODE_PATH),+ tsWorker.getCompilerOptionsDiagnostics(USER_CODE_PATH),] as const);- setTsErrors(- testErrors.map((err, i) => {- return [...err, ...(userErrors[i] || [])];- }) as TsErrors,- );-- monaco.languages.registerInlayHintsProvider(- 'typescript',- createTwoslashInlayProvider(monaco, ts),- );+ setTsErrors(testErrors);},}}onChange={{- tests: (code) => {+ tests: async (code = '') => {if (isPlayground) {props.updatePlaygroundTestsLocalStorage?.(code ?? '');++ if (!monacoInstance) return null;+ setCode(code);+ setLocalStorageCode(code);++ const getTsWorker = await monacoInstance.languages.typescript.getTypeScriptWorker();++ const mm = monacoInstance.editor.getModel(monacoInstance.Uri.parse(TESTS_PATH));+ if (!mm) return null;++ const tsWorker = await getTsWorker(mm.uri);++ const testErrors = await Promise.all([+ tsWorker.getSemanticDiagnostics(TESTS_PATH),+ tsWorker.getSyntacticDiagnostics(TESTS_PATH),+ tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),+ ] as const);++ setTsErrors(testErrors);}},- user: async (code) => {+ user: async (code = '') => {if (!monacoInstance) return null;if (isPlayground) {props.updatePlaygroundCodeLocalStorage?.(code ?? '');}- setCode(code ?? '');- setLocalStorageCode(code ?? '');+ setCode(code);+ setLocalStorageCode(code);+const getTsWorker = await monacoInstance.languages.typescript.getTypeScriptWorker();const mm = monacoInstance.editor.getModel(monacoInstance.Uri.parse(TESTS_PATH));@@ -206,17 +197,7 @@ export function CodePanel(props: CodePanelProps) {tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),] as const);- const userErrors = await Promise.all([- tsWorker.getSemanticDiagnostics(USER_CODE_PATH),- tsWorker.getSyntacticDiagnostics(USER_CODE_PATH),- tsWorker.getCompilerOptionsDiagnostics(USER_CODE_PATH),- ] as const);-- setTsErrors(- testErrors.map((err, i) => {- return [...err, ...(userErrors[i] || [])];- }) as TsErrors,- );+ setTsErrors(testErrors);},}}/>diff --git a/packages/monaco/src/split-editor.tsx b/packages/monaco/src/split-editor.tsxindex 3a8b6ff4..4c372c70 100644--- a/packages/monaco/src/split-editor.tsx+++ b/packages/monaco/src/split-editor.tsx@@ -1,15 +1,21 @@'use client';+import { createTwoslashInlayProvider } from './twoslash';+import { type OnChange, type OnMount, type OnValidate } from '@monaco-editor/react';+import { setupTypeAcquisition } from '@typescript/ata';import clsx from 'clsx';+import debounce from 'lodash/debounce';import type * as monacoType from 'monaco-editor';-import { useEffect, useRef } from 'react';+import dynamic from 'next/dynamic';+import { useEffect, useRef, useState } from 'react';+import ts from 'typescript';import { CodeEditor, LIB_URI } from './code-editor';+import { useResetEditor } from './editor-hooks';import { libSource } from './editor-types';-import dynamic from 'next/dynamic';+import { PrettierFormatProvider } from './prettier';import { useEditorSettingsStore } from './settings-store';-import { getEventDeltas, typeCheck } from './utils';-import { useResetEditor } from './editor-hooks';+import { getEventDeltas } from './utils';function preventSelection(event: Event) {event.preventDefault();@@ -49,6 +55,17 @@ export interface SplitEditorProps {isTestsReadonly?: boolean;}+export const hasImports = (code: string) => {+ const x = code.split('\n').filter((line) => line.trim().startsWith('import'));+ return x.length > 0;+};++const getActualCode = (code: string) =>+ code+ .split('\n')+ .filter((c) => !c.trim().startsWith('import'))+ .join('\n');+// million-ignoreexport default function SplitEditor({className,@@ -69,6 +86,67 @@ export default function SplitEditor({const wrapper = useRef<HTMLDivElement>(null);const resizer = useRef<HTMLDivElement>(null);const testPanel = useRef<HTMLDivElement>(null);+ const monacoRef = useRef<typeof import('monaco-editor')>();+ const editorRef = useRef<monacoType.editor.IStandaloneCodeEditor>();++ useEffect(() => {+ monacoRef.current = monaco;+ }, [monaco]);+ useEffect(() => {+ editorRef.current = userEditorState;+ }, [userEditorState]);++ // i moved this into onMount to avpid the monacoRef stuff but then you can really debounce it+ const [ata] = useState(() =>+ setupTypeAcquisition({+ projectName: 'TypeHero Playground',+ typescript: ts,+ logger: console,+ delegate: {+ // NOTE: this gets cached so it wont execute if you comment out an import and uncomment it.+ // it will only be called the first time+ receivedFile: (code: string, _path: string) => {+ if (!monacoRef.current || !editorRef.current) {+ return;+ }+ const path = `file://${_path}`;+ const uri = monacoRef.current.Uri.parse(path);+ const model = monacoRef.current.editor.getModel(uri);+ if (!model) {+ monacoRef.current.languages.typescript.typescriptDefaults.addExtraLib(code, path);+ monacoRef.current.editor.createModel(code, 'typescript', uri);+ }++ const userCode = monacoRef.current.editor+ .getModel(monacoRef.current.Uri.parse(USER_CODE_PATH))!+ .getValue();++ const testCode = monacoRef.current.editor+ .getModel(monacoRef.current.Uri.parse(TESTS_PATH))!+ .getValue();++ if (hasImports(userCode)) {+ monacoRef.current.languages.typescript.typescriptDefaults.addExtraLib(+ getActualCode(userCode),+ 'file:///node_modules/@types/user.d.ts',+ );+ }++ if (hasImports(testCode)) {+ monacoRef.current.languages.typescript.typescriptDefaults.addExtraLib(+ getActualCode(testCode),+ 'file:///node_modules/@types/test.d.ts',+ );+ }++ onMount?.tests?.(editorRef.current, monacoRef.current);+ },+ },+ }),+ );++ const debouncedUserCodeAta = useRef(debounce((code: string) => ata(code), 1000)).current;+ const debouncedTestCodeAta = useRef(debounce((code: string) => ata(code), 1000)).current;useEffect(() => {const resizerRef = resizer.current;@@ -167,26 +245,10 @@ export default function SplitEditor({};}, [settings, updateSettings, setIsTestPanelExpanded]);- useEffect(() => {- if (monaco) {- const libUri = monaco.Uri.parse(LIB_URI);-- monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);-- if (!monaco.editor.getModel(libUri)) {- monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, LIB_URI);- monaco.editor- .createModel(libSource, 'typescript', libUri)- .setEOL(monaco.editor.EndOfLineSequence.LF);- }- }- }, [monaco]);-subscribe('resetCode',() => {if (monaco && userEditorState) {- typeCheck(monaco);onMount?.tests?.(userEditorState, monaco);}},@@ -200,16 +262,96 @@ export default function SplitEditor({className="overflow-hidden"height={userEditorState && settings.bindings === 'vim' ? 'calc(100% - 36px)' : '100%'}defaultPath={USER_CODE_PATH}- onMount={onMount?.user}+ onMount={async (editor, monaco) => {+ // this just does the typechecking so the UI can update+ onMount?.user?.(editor, monaco);+ const libUri = monaco.Uri.parse(LIB_URI);++ monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true);++ if (!monaco.editor.getModel(libUri)) {+ monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, LIB_URI);+ monaco.editor+ .createModel(libSource, 'typescript', libUri)+ .setEOL(monaco.editor.EndOfLineSequence.LF);+ }++ const model = monaco.editor.getModel(monaco.Uri.parse(USER_CODE_PATH))!;+ const code = model.getValue();+ debouncedUserCodeAta(code);+ monaco.languages.typescript.typescriptDefaults.setCompilerOptions({+ ...monaco.languages.typescript.typescriptDefaults.getCompilerOptions(),+ strict: true,+ target: monaco.languages.typescript.ScriptTarget.ESNext,+ strictNullChecks: true,+ moduleResolution: monaco.languages.typescript.ModuleResolutionKind.NodeJs,+ allowSyntheticDefaultImports: true,+ outDir: 'lib', // kills the override input file error+ });++ monaco.languages.registerDocumentFormattingEditProvider(+ 'typescript',+ PrettierFormatProvider,+ );++ const getTsWorker = await monaco.languages.typescript.getTypeScriptWorker();+ const tsWorker = await getTsWorker(model.uri);++ monaco.languages.registerInlayHintsProvider(+ 'typescript',+ createTwoslashInlayProvider(monaco, tsWorker),+ );++ if (hasImports(code)) {+ const actualCode = code+ .split('\n')+ .filter((c) => !c.trim().startsWith('import'))+ .join('\n');+ if (actualCode) {+ monaco.languages.typescript.typescriptDefaults.setExtraLibs([+ {+ content: actualCode,+ filePath: 'file:///node_modules/@types/user.d.ts',+ },+ ]);+ }+ }+ }}defaultValue={userCode}value={userCode}onValidate={onValidate?.user}- onChange={async (e, a) => {- if (monaco) {- typeCheck(monaco);+ onChange={async (value, changeEvent) => {+ const code = value ?? '';+ debouncedUserCodeAta(code);+ if (hasImports(code)) {+ const actualCode = code+ .split('\n')+ .filter((c) => !c.trim().startsWith('import'))+ .join('\n');+ if (actualCode) {+ monaco?.languages.typescript.typescriptDefaults.setExtraLibs([+ {+ content: actualCode,+ filePath: 'file:///node_modules/@types/user.d.ts',+ },+ ]);+ }+ // we'll need to typecheck tests here in the event that you uncomment the same import+ // because `receivedFile` wont be called again+ setTimeout(() => {+ // send to next tick+ onMount?.tests?.(editorRef.current!, monacoRef.current!);+ });+ } else {+ // we want to blow away the user.d.ts because+ // 1. its no longer needed+ // 2. so you dont get duplicate type errors if you add imports back in+ monaco?.languages.typescript.typescriptDefaults.addExtraLib(+ '',+ 'file:///node_modules/@types/user.d.ts',+ );}-- onChange?.user?.(e, a);+ onChange?.user?.(value, changeEvent);}}/>{userEditorState && settings.bindings === 'vim' && (@@ -235,20 +377,53 @@ export default function SplitEditor({<CodeEditoroptions={{lineNumbers: 'off',+ renderValidationDecorations: 'on',+ readOnly: isTestsReadonly,}}onMount={(editor, monaco) => {- editor.updateOptions({- readOnly: isTestsReadonly,- renderValidationDecorations: 'on',- });-+ // this just does the typechecking so the UI can updateonMount?.tests?.(editor, monaco);+ const testModel = monaco.editor.getModel(monaco.Uri.parse(TESTS_PATH))!;+ const testCode = testModel.getValue();+ debouncedTestCodeAta(testCode);++ if (hasImports(testCode)) {+ const actualCode = testCode+ .split('\n')+ .filter((c) => !c.startsWith('import'))+ .join('\n');+ if (actualCode) {+ monaco.languages.typescript.typescriptDefaults.setExtraLibs([+ {+ content: actualCode,+ filePath: 'file:///node_modules/@types/test.d.ts',+ },+ ]);+ }+ }}}defaultPath={TESTS_PATH}value={tests}defaultValue={tests}- onChange={async (e, a) => {- onChange?.tests?.(e, a);+ onChange={async (editor, changeEvent) => {+ const code = editor ?? '';+ debouncedTestCodeAta(code);+ if (hasImports(code)) {+ const actualCode = code+ .split('\n')+ .filter((c) => !c.startsWith('import'))+ .join('\n');+ if (actualCode) {+ monaco?.languages.typescript.typescriptDefaults.setExtraLibs([+ {+ content: actualCode,+ filePath: 'file:///node_modules/@types/test.d.ts',+ },+ ]);+ }+ }++ onChange?.tests?.(editor, changeEvent);}}onValidate={onValidate?.tests}/>diff --git a/packages/monaco/src/twoslash.ts b/packages/monaco/src/twoslash.tsindex 1e4d5efd..9beaa6ed 100644--- a/packages/monaco/src/twoslash.ts+++ b/packages/monaco/src/twoslash.ts@@ -2,7 +2,6 @@import type * as monaco from 'monaco-editor';export const TWOSLASH_INLAY_HINTS_PROVIDER = 'twoslash inlay hints provider';-const queryRegex = /^\s*\/\/\s*\^\?$/gm;export const createTwoslashInlayProvider = (m: typeof monaco,@@ -22,6 +21,7 @@ export const createTwoslashInlayProvider = (};}+ const queryRegex = /^\s*\/\/\s*\^\?$/gm;while ((match = queryRegex.exec(text)) !== null) {const end = match.index + match[0].length - 1;const endPos = model.getPositionAt(end);diff --git a/packages/monaco/src/utils.ts b/packages/monaco/src/utils.tsindex d39a9a5d..d7f662df 100644--- a/packages/monaco/src/utils.ts+++ b/packages/monaco/src/utils.ts@@ -1,5 +1,3 @@-import type * as MonacoEditor from 'monaco-editor';-export function getEventDeltas(e: MouseEvent | TouchEvent, origin: { x: number; y: number }) {if (e instanceof MouseEvent) {return {@@ -27,34 +25,3 @@ 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);- }-}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 87bc2e3e..307514e3 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -534,9 +534,15 @@ importers:'@repo/ui':specifier: workspace:^version: link:../ui+ '@typescript/ata':+ specifier: ^0.9.4+ version: 0.9.4([email protected])clsx:specifier: ^2.0.0version: 2.0.0+ lodash:+ specifier: ^4.17.21+ version: 4.17.21lz-string:specifier: ^1.5.0version: 1.5.0@@ -700,7 +706,7 @@ importers:dependencies:'@next/eslint-plugin-next':specifier: canary- version: 13.4.20-canary.15+ version: 13.4.20-canary.0'@repo/tsconfig':specifier: workspace:*version: link:../config-typescript@@ -712,7 +718,7 @@ importers:version: 5.62.0([email protected])([email protected])'@vercel/style-guide':specifier: ^4.0.2eslint:specifier: ^8.45.0version: 8.45.0@@ -1807,8 +1813,8 @@ packages:glob: 7.1.7dev: true- /@next/[email protected]:- resolution: {integrity: sha512-Bolwt8DYYASzNADy9XIu/q5tLp+/9pVL3DWuaSWpb4UvaJMgyHIgmi+5pM5oRQiC7BwBDErnTBdiEmaP7zl/dQ==}+ /@next/[email protected]:+ resolution: {integrity: sha512-vFC1meiw/awh2xJZMWaoECsfZbgkt2fF3HIg8f2fSM/w41Z86L1SS7SjKmpbbD87yq3tiqgqHmFv0JCych4g4g==}dependencies:glob: 7.1.7dev: false@@ -4394,6 +4400,14 @@ packages:'@typescript-eslint/types': 5.62.0eslint-visitor-keys: 3.4.3+ /@typescript/[email protected]([email protected]):+ resolution: {integrity: sha512-PaJ16WouPV/SaA+c0tnOKIqYq24+m93ipl/e0Dkxuianer+ibc5b0/6ZgfCFF8J7QEp57dySMSP9nWOFaCfJnw==}+ peerDependencies:+ typescript: ^4.4.4+ dependencies:+ typescript: 5.1.6+ dev: false+/@uiw/[email protected]:resolution: {integrity: sha512-1bbGZ3T+SGmA07BoVPK4UCUDcowDN/moctviJGQexfOc9qL8TMLDQPr7mTPvDKhgJkgnlKkAQNFU8PiarIi9sQ==}dev: false@@ -4497,7 +4511,7 @@ packages:yoga-wasm-web: 0.3.0dev: false- /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):+ /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-FroL+oOePzhw7n/I+f7zr4WNroGHT/+2TlW6WH9+CVSjMNsEyu7Qstj2mI5gWIBjT1Y2ZImKPppCzI2cIYmNZw==}engines: {node: '>=16'}peerDependencies:@@ -4517,7 +4531,7 @@ packages:dependencies:'@babel/core': 7.22.10'@babel/eslint-parser': 7.22.10(@babel/[email protected])([email protected])- '@next/eslint-plugin-next': 13.4.20-canary.15+ '@next/eslint-plugin-next': 13.4.20-canary.0'@rushstack/eslint-patch': 1.3.2'@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/[email protected])([email protected])([email protected])'@typescript-eslint/parser': 5.62.0([email protected])([email protected])@@ -8926,22 +8940,6 @@ packages:camelcase-css: 2.0.1postcss: 8.4.28- resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}- engines: {node: '>= 10'}- peerDependencies:- postcss: '>=8.0.9'- ts-node: '>=9.0.0'- peerDependenciesMeta:- postcss:- optional: true- ts-node:- optional: true- dependencies:- lilconfig: 2.1.0- yaml: 1.10.2- dev: true-resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}engines: {node: '>= 10'}@@ -8957,7 +8955,6 @@ packages:lilconfig: 2.1.0postcss: 8.4.21yaml: 1.10.2- dev: falseresolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}@@ -9019,7 +9016,6 @@ packages:nanoid: 3.3.6picocolors: 1.0.0source-map-js: 1.0.2- dev: falseresolution: {integrity: sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==}@@ -10515,7 +10511,7 @@ packages:execa: 5.1.1globby: 11.1.0joycon: 3.1.1- postcss-load-config: 3.1.4+ postcss-load-config: 3.1.4([email protected])resolve-from: 5.0.0rollup: 2.79.1source-map: 0.7.4