feat: show overlay error under API mode

fi3ework · Mar 28, 2021 · 2ace313 · 2ace313
1 parent 5231531
commit 2ace313
Showing 1 changed file with 59 additions and 16 deletions.
diff --git a/src/apiMode.ts b/src/apiMode.ts
@@ -1,6 +1,7 @@
+import { ErrorPayload } from 'vite'
 import ts from 'typescript'
-import type { UserConfig, ViteDevServer } from 'vite'
 
+import type { UserConfig, ViteDevServer } from 'vite'
 interface DiagnoseOptions {
   root: string
   tsconfigPath: string
@@ -12,26 +13,30 @@ const formatHost: ts.FormatDiagnosticsHost = {
   getNewLine: () => ts.sys.newLine,
 }
 
-function reportDiagnostic(diagnostic: ts.Diagnostic) {
-  console.error(
-    'Error',
-    diagnostic.code,
-    ':',
-    ts.flattenDiagnosticMessageText(diagnostic.messageText, formatHost.getNewLine())
-  )
+function toViteError(diagnostic: ts.Diagnostic): ErrorPayload['err'] {
+  return {
+    message: 'string',
+    stack: 'a/b/c/d',
+    id: 'string',
+    frame: 'string',
+    plugin: 'string',
+    pluginCode: 'string',
+    // loc?: {
+    // file?: string
+    // line: number
+    // column: number
+    // }
+  }
 }
 
 /**
  * Prints a diagnostic every time the watch status changes.
  * This is mainly for messages like "Starting compilation" or "Compilation completed".
  */
-function reportWatchStatusChanged(diagnostic: ts.Diagnostic) {
-  console.info(ts.formatDiagnostic(diagnostic, formatHost))
-}
 
 export function createDiagnosis(userOptions: Partial<DiagnoseOptions> = {}) {
   let overlay = true // Vite default to true
-  let err: string | null = null
+  let currErr: ErrorPayload['err'] | null = null
 
   return {
     config: (config: UserConfig) => {
@@ -57,12 +62,50 @@ export function createDiagnosis(userOptions: Partial<DiagnoseOptions> = {}) {
         throw new Error("Could not find a valid 'tsconfig.json'.")
       }
 
-      // const { config } = ts.readConfigFile(configFile, ts.sys.readFile)
-      // const { options } = ts.parseJsonConfigFileContent(config, ts.sys, finalConfig.root)
-      // force --noEmit
-      // options.noEmit = true
+      const reportDiagnostic = (diagnostic: ts.Diagnostic) => {
+        const { file } = diagnostic
+        console.error(
+          'Error',
+          diagnostic.code,
+          ':',
+          ts.flattenDiagnosticMessageText(diagnostic.messageText, formatHost.getNewLine())
+        )
+        return toViteError(diagnostic)
+      }
+
+      const reportWatchStatusChanged: ts.WatchStatusReporter = (
+        diagnostic,
+        newLine,
+        options,
+        errorCount
+      ) => {
+        // https://github.com/microsoft/TypeScript/issues/32542
+        console.log(diagnostic)
+        switch (diagnostic.code) {
+          case 6031: // Initial build
+          case 6032: // Incremental build
+            // clear current error and use the newer error from compiler
+            currErr = null
+            break
+          case 6193: // 1 Error
+            currErr = toViteError(diagnostic)
+          case 6194: // 0 errors or 2+ errors
+            if (errorCount === 0 || errorCount === undefined) {
+            } else {
+              if (!currErr) currErr = toViteError(diagnostic)
+            }
+
+            if (currErr) {
+              server.ws.send({
+                type: 'error',
+                err: currErr,
+              })
+            }
+        }
+      }
 
       // https://github.com/microsoft/TypeScript/issues/32385
+      // https://github.com/microsoft/TypeScript/pull/33082/files
       const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram
       const host = ts.createWatchCompilerHost(
         configFile,