fix: show ts errors in the terminal with --incremental & bump volar

mpx-ecology · Apr 5, 2024 · 78daab3 · 78daab3
1 parent da5b9dd
commit 78daab3
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -37,10 +37,10 @@
 		"mpx-tsc": "bin/mpx-tsc.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.2",
-		"@volar/typescript": "2.2.0-alpha.2",
+		"@volar/language-core": "2.2.0-alpha.5",
+		"@volar/typescript": "2.2.0-alpha.5",
 		"@vue/compiler-dom": "^3.4.21",
-		"@vue/language-core": "2.0.7",
+		"@vue/language-core": "2.0.10",
 		"computeds": "^0.0.1",
 		"minimatch": "^9.0.3",
 		"path-browserify": "^1.0.1",
@@ -54,11 +54,5 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.2",
 		"vitest": "latest"
-	},
-	"pnpm": {
-		"overrides": {
-			"@volar/language-core": "2.2.0-alpha.2",
-			"@volar/typescript": "2.2.0-alpha.2"
-		}
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,5 @@
 import * as vue from "@vue/language-core";
 import { runTsc } from "@volar/typescript/lib/quickstart/runTsc";
-import type * as TypeTS from "typescript";
 import { createVueLanguagePlugin } from "./languageModule";
 
 const windowsPathReg = /\\/g;
@@ -22,11 +21,30 @@ export function run() {
               ).vueOptions
             : vue.resolveVueCompilerOptions({});
         vueOptions.extensions = runExtensions;
-        const fakeGlobalTypesHolder = createFakeGlobalTypesHolder(options);
+
+        const writeFile = options.host!.writeFile.bind(options.host);
+        options.host!.writeFile = (fileName, contents, ...args) => {
+          if (
+            fileName.endsWith(".d.ts") &&
+            vueLanguagePlugin
+              .getCanonicalFileName(fileName.replace(windowsPathReg, "/"))
+              .slice(0, -5) ===
+              vueLanguagePlugin.pluginContext.globalTypesHolder
+          ) {
+            contents = removeEmitGlobalTypes(contents);
+          }
+          return writeFile(fileName, contents, ...args);
+        };
+
         const vueLanguagePlugin = createVueLanguagePlugin(
           ts,
           (id) => id,
-          (fileName) => fileName === fakeGlobalTypesHolder,
+          options.host?.useCaseSensitiveFileNames?.() ?? false,
+          () => "",
+          () =>
+            options.rootNames.map((rootName) =>
+              rootName.replace(windowsPathReg, "/")
+            ),
           options.options,
           vueOptions,
           false
@@ -48,42 +66,11 @@ export function run() {
   }
 }
 
-export function createFakeGlobalTypesHolder(
-  options: TypeTS.CreateProgramOptions
-) {
-  const firstVueFile = options.rootNames.find((fileName) =>
-    fileName.endsWith(".mpx")
+export function removeEmitGlobalTypes(dts: string) {
+  return dts.replace(
+    /[^\n]*__VLS_globalTypesStart[\w\W]*__VLS_globalTypesEnd[^\n]*\n/,
+    ""
   );
-  if (firstVueFile) {
-    const fakeFileName = firstVueFile + "__VLS_globalTypes.mpx";
-
-    (options.rootNames as string[]).push(fakeFileName);
-
-    const fileExists = options.host!.fileExists.bind(options.host);
-    const readFile = options.host!.readFile.bind(options.host);
-    const writeFile = options.host!.writeFile.bind(options.host);
-
-    options.host!.fileExists = (fileName) => {
-      if (fileName.endsWith("__VLS_globalTypes.mpx")) {
-        return true;
-      }
-      return fileExists(fileName);
-    };
-    options.host!.readFile = (fileName) => {
-      if (fileName.endsWith("__VLS_globalTypes.mpx")) {
-        return '<script setup lang="ts"></script>';
-      }
-      return readFile(fileName);
-    };
-    options.host!.writeFile = (fileName, ...args) => {
-      if (fileName.endsWith("__VLS_globalTypes.mpx.d.ts")) {
-        return;
-      }
-      return writeFile(fileName, ...args);
-    };
-
-    return fakeFileName.replace(windowsPathReg, "/");
-  }
 }
 
 export function resolveCommonLanguageId(fileNameOrUri: string) {

diff --git a/src/languageModule.ts b/src/languageModule.ts
@@ -59,14 +59,21 @@ function getFileRegistryKey(
   return JSON.stringify(values);
 }
 
+interface _Plugin extends LanguagePlugin<VueGeneratedCode> {
+  getCanonicalFileName: (fileName: string) => string;
+  pluginContext: Parameters<VueLanguagePlugin>[0];
+}
+
 export function createVueLanguagePlugin(
   ts: typeof import("typescript"),
   getFileName: (fileId: string) => string,
-  isValidGlobalTypesHolder: (fileName: string) => boolean,
+  useCaseSensitiveFileNames: boolean,
+  getProjectVersion: () => string,
+  getScriptFileNames: () => string[] | Set<string>,
   compilerOptions: ts.CompilerOptions,
   vueCompilerOptions: VueCompilerOptions,
   codegenStack: boolean = false
-): LanguagePlugin<VueGeneratedCode> {
+): _Plugin {
   const allowLanguageIds = new Set(["mpx"]);
   const pluginContext: Parameters<VueLanguagePlugin>[0] = {
     modules: {
@@ -93,13 +100,28 @@ export function createVueLanguagePlugin(
     allowLanguageIds.add("html");
   }
 
+  const getCanonicalFileName = useCaseSensitiveFileNames
+    ? (fileName: string) => fileName
+    : (fileName: string) => fileName.toLowerCase();
+  let canonicalRootFileNames = new Set<string>();
+  let canonicalRootFileNamesVersion: string | undefined;
+
   return {
+    getCanonicalFileName,
+    pluginContext,
     createVirtualCode(fileId, languageId, snapshot) {
       if (allowLanguageIds.has(languageId)) {
         const fileName = getFileName(fileId);
+        const projectVersion = getProjectVersion();
+        if (projectVersion !== canonicalRootFileNamesVersion) {
+          canonicalRootFileNames = new Set(
+            [...getScriptFileNames()].map(getCanonicalFileName)
+          );
+          canonicalRootFileNamesVersion = projectVersion;
+        }
         if (
           !pluginContext.globalTypesHolder &&
-          isValidGlobalTypesHolder(fileName)
+          canonicalRootFileNames.has(getCanonicalFileName(fileName))
         ) {
           pluginContext.globalTypesHolder = fileName;
         }