@vue/typescript-plugin 2.0.29 → 2.1.2

package/index.d.ts

@@ -1,2 +1,3 @@
-declare const plugin: import("typescript").server.PluginModuleFactory;
+import type * as ts from 'typescript';
+declare const plugin: ts.server.PluginModuleFactory;
 export = plugin;

package/index.js

@@ -4,11 +4,11 @@ const vue = require("@vue/language-core");
 const common_1 = require("./lib/common");
 const server_1 = require("./lib/server");
 const windowsPathReg = /\\/g;
-const plugin = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((ts, info) => {
+const vueCompilerOptions = new WeakMap();
+const basePlugin = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((ts, info) => {
     const vueOptions = getVueCompilerOptions();
-    const languagePlugin = vue.createVueLanguagePlugin2(ts, id => id, info.project.projectKind === ts.server.ProjectKind.Inferred
-        ? () => true
-        : vue.createRootFileChecker(info.languageServiceHost.getProjectVersion ? () => info.languageServiceHost.getProjectVersion() : undefined, () => createLanguageServicePlugin_1.externalFiles.get(info.project) ?? [], info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false), info.languageServiceHost.getCompilationSettings(), vueOptions);
+    const languagePlugin = vue.createVueLanguagePlugin(ts, info.languageServiceHost.getCompilationSettings(), vueOptions, id => id);
+    vueCompilerOptions.set(info.project, vueOptions);
     return {
         languagePlugins: [languagePlugin],
         setup: language => {
@@ -36,5 +36,25 @@ const plugin = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((t
         }
     }
 });
+const plugin = mods => {
+    const pluginModule = basePlugin(mods);
+    return {
+        ...pluginModule,
+        getExternalFiles(proj, updateLevel = 0) {
+            const options = vueCompilerOptions.get(proj);
+            if (updateLevel >= 1 && options) {
+                try {
+                    const libDir = require.resolve(`${options.lib}/package.json`, { paths: [proj.getCurrentDirectory()] })
+                        .slice(0, -'package.json'.length);
+                    const globalTypesPath = `${libDir}dist/__globalTypes_${options.target}_${options.strictTemplates}.d.ts`;
+                    const globalTypesContents = vue.generateGlobalTypes(options.lib, options.target, options.strictTemplates);
+                    proj.writeFile(globalTypesPath, globalTypesContents);
+                }
+                catch { }
+            }
+            return pluginModule.getExternalFiles?.(proj, updateLevel) ?? [];
+        },
+    };
+};
 module.exports = plugin;
 //# sourceMappingURL=index.js.map

package/lib/requests/collectExtractProps.js

@@ -9,10 +9,7 @@ function collectExtractProps(fileName, templateCodeRange) {
         return;
     }
     const result = new Map();
-    const program = languageService.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+    const program = languageService.getProgram();
     const sourceFile = program.getSourceFile(fileName);
     const checker = program.getTypeChecker();
     const script = volarFile.generated?.languagePlugin.typescript?.getServiceScript(volarFile.generated.root);

package/lib/requests/componentInfos.js

@@ -15,10 +15,7 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
         return;
     }
     const vueCode = volarFile.generated.root;
-    const program = languageService.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+    const program = languageService.getProgram();
     const checker = program.getTypeChecker();
     const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
     if (!components) {
@@ -81,10 +78,7 @@ function getComponentEvents(fileName, tag) {
         return;
     }
     const vueCode = volarFile.generated.root;
-    const program = languageService.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+    const program = languageService.getProgram();
     const checker = program.getTypeChecker();
     const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
     if (!components) {
@@ -174,10 +168,7 @@ function getElementAttrs(fileName, tagName) {
     if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
-    const program = languageService.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+    const program = languageService.getProgram();
     let tsSourceFile;
     if (tsSourceFile = program.getSourceFile(fileName)) {
         const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === '__VLS_IntrinsicElementsCompletion');
@@ -193,11 +184,8 @@ function getElementAttrs(fileName, tagName) {
     }
     return [];
 }
-function getVariableType(ts, tsLs, vueCode, name) {
-    const program = tsLs.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+function getVariableType(ts, languageService, vueCode, name) {
+    const program = languageService.getProgram();
     let tsSourceFile;
     if (tsSourceFile = program.getSourceFile(vueCode.fileName)) {
         const node = searchVariableDeclarationNode(ts, tsSourceFile, name);

package/lib/requests/getPropertiesAtLocation.js

@@ -31,10 +31,7 @@ function getPropertiesAtLocation(fileName, position) {
             position += file.snapshot.getLength();
         }
     }
-    const program = languageService.getCurrentProgram();
-    if (!program) {
-        return;
-    }
+    const program = languageService.getProgram();
     const sourceFile = program.getSourceFile(fileName);
     if (!sourceFile) {
         return;

package/lib/server.js

@@ -19,25 +19,25 @@ async function startNamedPipeServer(ts, info, language, projectKind) {
             }
             const request = JSON.parse(text);
             const fileName = request.args[0];
+            const requestContext = {
+                typescript: ts,
+                languageService: info.languageService,
+                languageServiceHost: info.languageServiceHost,
+                language: language,
+                isTsPlugin: true,
+                getFileId: (fileName) => fileName,
+            };
             if (request.type === 'containsFile') {
                 sendResponse(info.project.containsFile(ts.server.toNormalizedPath(fileName)));
             }
-            if (request.type === 'projectInfo') {
+            else if (request.type === 'projectInfo') {
                 sendResponse({
                     name: info.project.getProjectName(),
                     kind: info.project.projectKind,
                     currentDirectory: info.project.getCurrentDirectory(),
                 });
             }
-            const requestContext = {
-                typescript: ts,
-                languageService: info.languageService,
-                languageServiceHost: info.languageServiceHost,
-                language: language,
-                isTsPlugin: true,
-                getFileId: (fileName) => fileName,
-            };
-            if (request.type === 'collectExtractProps') {
+            else if (request.type === 'collectExtractProps') {
                 const result = collectExtractProps_1.collectExtractProps.apply(requestContext, request.args);
                 sendResponse(result);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.29",
+	"version": "2.1.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.0-alpha.18",
-		"@vue/language-core": "2.0.29",
+		"@volar/typescript": "~2.4.1",
+		"@vue/language-core": "2.1.2",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "49ad9563e6f2677595878a000179dfea83fb910c"
+	"gitHead": "4e4b839ea20ae11a2aef7ee9206465cb60a4be53"
 }