@vue/typescript-plugin 2.0.16 → 2.0.18

package/index.js

@@ -42,7 +42,7 @@ function createLanguageServicePlugin() {
                     projectExternalFileExtensions.set(info.project, extensions);
                     server_1.projects.set(info.project, { info, language, vueOptions });
                     (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                    (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true);
+                    (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true, fileName => fileName);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                     (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
                     // #3963

package/lib/common.d.ts

@@ -1,6 +1,6 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceForVue(language: vue.Language, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean): void;
+export declare function decorateLanguageServiceForVue(language: vue.Language, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean, getScriptId: (fileName: string) => string): void;
 export declare function getComponentSpans(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;

package/lib/common.js

@@ -4,8 +4,8 @@ exports.getComponentSpans = exports.decorateLanguageServiceForVue = void 0;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const componentInfos_1 = require("./requests/componentInfos");
-function decorateLanguageServiceForVue(language, languageService, vueOptions, ts, isTsPlugin) {
-    const { getCompletionsAtPosition, getCompletionEntryDetails, getCodeFixesAtPosition, getEncodedSemanticClassifications, } = languageService;
+function decorateLanguageServiceForVue(language, languageService, vueOptions, ts, isTsPlugin, getScriptId) {
+    const { getCompletionsAtPosition, getCompletionEntryDetails, getCodeFixesAtPosition, getEncodedSemanticClassifications, getQuickInfoAtPosition, } = languageService;
     languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
         const result = getCompletionsAtPosition(fileName, position, options, formattingSettings);
         if (result) {
@@ -36,6 +36,12 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
                             break;
                         }
                     }
+                    if (item.data) {
+                        // @ts-expect-error
+                        item.data.__isAutoImport = {
+                            fileName,
+                        };
+                    }
                 }
             }
         }
@@ -56,6 +62,27 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
                 }
             }
         }
+        // @ts-expect-error
+        if (args[6]?.__isAutoImport) {
+            // @ts-expect-error
+            const { fileName } = args[6]?.__isAutoImport;
+            const sourceScript = language.scripts.get(getScriptId(fileName));
+            if (sourceScript?.generated?.root instanceof vue.VueVirtualCode) {
+                const sfc = sourceScript.generated.root.getVueSfc();
+                if (!sfc?.descriptor.script && !sfc?.descriptor.scriptSetup) {
+                    for (const codeAction of details?.codeActions ?? []) {
+                        for (const change of codeAction.changes) {
+                            for (const textChange of change.textChanges) {
+                                textChange.newText = `<script setup lang="ts">${textChange.newText}</script>\n\n`;
+                                break;
+                            }
+                            break;
+                        }
+                        break;
+                    }
+                }
+            }
+        }
         return details;
     };
     languageService.getCodeFixesAtPosition = (...args) => {
@@ -64,10 +91,46 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
         result = result.filter(entry => entry.description.indexOf('__VLS_') === -1);
         return result;
     };
+    languageService.getQuickInfoAtPosition = (...args) => {
+        const result = getQuickInfoAtPosition(...args);
+        if (result && result.documentation?.length === 1 && result.documentation[0].text.startsWith('__VLS_emit,')) {
+            const [_, emitVarName, eventName] = result.documentation[0].text.split(',');
+            const program = languageService.getProgram();
+            const typeChecker = program.getTypeChecker();
+            const sourceFile = program.getSourceFile(args[0]);
+            result.documentation = undefined;
+            let symbolNode;
+            sourceFile?.forEachChild(function visit(node) {
+                if (ts.isIdentifier(node) && node.text === emitVarName) {
+                    symbolNode = node;
+                }
+                if (symbolNode) {
+                    return;
+                }
+                ts.forEachChild(node, visit);
+            });
+            if (symbolNode) {
+                const emitSymbol = typeChecker.getSymbolAtLocation(symbolNode);
+                if (emitSymbol) {
+                    const type = typeChecker.getTypeOfSymbolAtLocation(emitSymbol, symbolNode);
+                    const calls = type.getCallSignatures();
+                    for (const call of calls) {
+                        const callEventName = typeChecker.getTypeOfSymbolAtLocation(call.parameters[0], symbolNode).value;
+                        call.getJsDocTags();
+                        if (callEventName === eventName) {
+                            result.documentation = call.getDocumentationComment(typeChecker);
+                            result.tags = call.getJsDocTags();
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    };
     if (isTsPlugin) {
         languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
             const result = getEncodedSemanticClassifications(fileName, span, format);
-            const file = language.scripts.get(fileName);
+            const file = language.scripts.get(getScriptId(fileName));
             if (file?.generated?.root instanceof vue.VueVirtualCode) {
                 const { template } = file.generated.root.sfc;
                 if (template) {

package/lib/requests/collectExtractProps.d.ts

@@ -1,12 +1,5 @@
-import { Language } from '@vue/language-core';
-import type * as ts from 'typescript';
-export declare function collectExtractProps(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: Language;
-    isTsPlugin: boolean;
-    getFileId: (fileName: string) => string;
-}, fileName: string, templateCodeRange: [number, number]): {
+import type { RequestContext } from './types';
+export declare function collectExtractProps(this: RequestContext, fileName: string, templateCodeRange: [number, number]): {
     name: string;
     type: string;
     model: boolean;

package/lib/requests/componentInfos.d.ts

@@ -1,11 +1,7 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function getComponentProps(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: vue.Language;
-    getFileId: (fileName: string) => string;
-}, fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
+import type { RequestContext } from './types';
+export declare function getComponentProps(this: RequestContext, fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
 export declare function getComponentEvents(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;

package/lib/requests/getImportPathForFile.d.ts

@@ -1,6 +1,3 @@
 import type * as ts from 'typescript';
-export declare function getImportPathForFile(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    languageServiceHost: ts.LanguageServiceHost;
-}, fileName: string, incomingFileName: string, preferences: ts.UserPreferences): string | undefined;
+import type { RequestContext } from './types';
+export declare function getImportPathForFile(this: RequestContext, fileName: string, incomingFileName: string, preferences: ts.UserPreferences): string | undefined;

package/lib/requests/getPropertiesAtLocation.d.ts

@@ -1,9 +1,2 @@
-import { Language } from '@vue/language-core';
-import type * as ts from 'typescript';
-export declare function getPropertiesAtLocation(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: Language;
-    isTsPlugin: boolean;
-    getFileId: (fileName: string) => string;
-}, fileName: string, position: number): string[] | undefined;
+import type { RequestContext } from './types';
+export declare function getPropertiesAtLocation(this: RequestContext, fileName: string, position: number): string[] | undefined;

package/lib/requests/getQuickInfoAtPosition.d.ts

@@ -1,4 +1,2 @@
-import type * as ts from 'typescript';
-export declare function getQuickInfoAtPosition(this: {
-    languageService: ts.LanguageService;
-}, fileName: string, position: number): ts.QuickInfo | undefined;
+import type { RequestContext } from './types';
+export declare function getQuickInfoAtPosition(this: RequestContext, fileName: string, position: number): import("typescript").QuickInfo | undefined;

package/lib/requests/types.d.ts

@@ -0,0 +1,10 @@
+import type { Language } from '@vue/language-core';
+import type * as ts from 'typescript';
+export interface RequestContext {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    languageServiceHost: ts.LanguageServiceHost;
+    language: Language;
+    isTsPlugin: boolean;
+    getFileId: (fileName: string) => string;
+}

package/lib/requests/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/server.d.ts

@@ -1,5 +1,5 @@
-import type * as ts from 'typescript';
 import type { Language, VueCompilerOptions } from '@vue/language-core';
+import type * as ts from 'typescript';
 export interface Request {
     type: 'projectInfoForFile' | 'collectExtractProps' | 'getImportPathForFile' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'getComponentProps' | 'getComponentEvents' | 'getTemplateContextProps' | 'getComponentNames' | 'getElementAttrs';
     args: [fileName: string, ...rest: any];

package/lib/server.js

@@ -38,7 +38,6 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
                     languageService: project.info.languageService,
                     languageServiceHost: project.info.languageServiceHost,
                     language: project.language,
-                    vueOptions: project.vueOptions,
                     isTsPlugin: true,
                     getFileId: (fileName) => fileName,
                 };

package/package.json

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