Connect, collaborate, and grow with a community of TypeScript developers
fix: validate test and user input in editor before submit (#825)
Vinh Quy Phan501f74254a4a
diff --git a/apps/web/src/components/navigation.tsx b/apps/web/src/components/navigation.tsxindex 9c8906be..34b70c7a 100644--- a/apps/web/src/components/navigation.tsx+++ b/apps/web/src/components/navigation.tsx@@ -45,8 +45,9 @@ export function Navigation({<header className="z-0 w-full">{!fssettings.isFullscreen && (<nav- className={`flex h-14 items-center text-sm font-medium ${pathname?.startsWith('/challenge') ? 'px-4' : 'container'- }`}+ className={`flex h-14 items-center text-sm font-medium ${+ pathname?.startsWith('/challenge') ? 'px-4' : 'container'+ }`}><div className="flex w-full items-center justify-between"><div className="relative flex items-center gap-3">diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsxindex 0830de9e..595de4a3 100644--- a/packages/monaco/src/index.tsx+++ b/packages/monaco/src/index.tsx@@ -149,13 +149,23 @@ export function CodePanel(props: CodePanelProps) {const ts = await (await monaco.languages.typescript.getTypeScriptWorker())(model.uri);- const errors = await Promise.all([+ const userErrors = await Promise.all([ts.getSemanticDiagnostics(USER_CODE_PATH),ts.getSyntacticDiagnostics(USER_CODE_PATH),ts.getCompilerOptionsDiagnostics(USER_CODE_PATH),] as const);- setTsErrors(errors);+ const testErrors = await Promise.all([+ ts.getSemanticDiagnostics(TESTS_PATH),+ ts.getSyntacticDiagnostics(TESTS_PATH),+ ts.getCompilerOptionsDiagnostics(TESTS_PATH),+ ] as const);++ setTsErrors(+ testErrors.map((err, i) => {+ return [...err, ...(userErrors[i] || [])];+ }) as TsErrors,+ );monaco.languages.registerInlayHintsProvider('typescript',@@ -183,13 +193,23 @@ export function CodePanel(props: CodePanelProps) {const tsWorker = await getTsWorker(mm.uri);- const errors = await Promise.all([+ const testErrors = await Promise.all([tsWorker.getSemanticDiagnostics(TESTS_PATH),tsWorker.getSyntacticDiagnostics(TESTS_PATH),tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),] as const);- setTsErrors(errors);+ 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,+ );},}}/>