@vue/typescript-plugin 2.0.14 → 2.0.16

package/index.js

@@ -23,16 +23,17 @@ function createLanguageServicePlugin() {
                     const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false, () => info.languageServiceHost.getProjectVersion?.() ?? '', () => externalFiles.get(info.project) ?? [], info.languageServiceHost.getCompilationSettings(), vueOptions);
                     const extensions = languagePlugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [];
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const getLanguageId = (fileName) => {
-                        if (extensions.some(ext => fileName.endsWith(ext))) {
-                            return 'vue';
-                        }
-                        return (0, language_core_1.resolveCommonLanguageId)(fileName);
-                    };
+                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
+                    const syncedScriptVersions = new vue.FileMap(ts.sys.useCaseSensitiveFileNames);
                     const language = (0, language_core_1.createLanguage)([languagePlugin], ts.sys.useCaseSensitiveFileNames, fileName => {
+                        const version = getScriptVersion(fileName);
+                        if (syncedScriptVersions.get(fileName) === version) {
+                            return;
+                        }
+                        syncedScriptVersions.set(fileName, version);
                         const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            language.scripts.set(fileName, getLanguageId(fileName), snapshot);
+                            language.scripts.set(fileName, snapshot);
                         }
                         else {
                             language.scripts.delete(fileName);
@@ -44,6 +45,13 @@ function createLanguageServicePlugin() {
                     (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                     (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
+                    // #3963
+                    const timer = setInterval(() => {
+                        if (info.project['program']) {
+                            clearInterval(timer);
+                            info.project['program'].__vue__ = { language };
+                        }
+                    }, 50);
                 }
                 return info.languageService;
                 function getVueCompilerOptions() {

package/lib/common.js

@@ -16,9 +16,9 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
             for (const item of result.entries) {
                 if (item.source) {
                     const originalName = item.name;
-                    for (const ext of vueOptions.extensions) {
-                        const suffix = (0, shared_1.capitalize)(ext.substring('.'.length)); // .vue -> Vue
-                        if (item.source.endsWith(ext) && item.name.endsWith(suffix)) {
+                    for (const vueExt of vueOptions.extensions) {
+                        const suffix = (0, shared_1.capitalize)(vueExt.slice(1)); // .vue -> Vue
+                        if (item.source.endsWith(vueExt) && item.name.endsWith(suffix)) {
                             item.name = (0, shared_1.capitalize)(item.name.slice(0, -suffix.length));
                             if (item.insertText) {
                                 // #2286
@@ -27,7 +27,7 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
                             if (item.data) {
                                 // @ts-expect-error
                                 item.data.__isComponentAutoImport = {
-                                    ext,
+                                    ext: vueExt,
                                     suffix,
                                     originalName,
                                     newName: item.insertText,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.14",
+	"version": "2.0.16",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.2.0-alpha.10",
-		"@vue/language-core": "2.0.14",
+		"@volar/typescript": "~2.2.0",
+		"@vue/language-core": "2.0.16",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "ce1412067f88b7f9af03a2d3e04c220b4921c363"
+	"gitHead": "95b78c38cbf75481ebb59e11956b592346f01d92"
 }