@vue/typescript-plugin 3.0.0-alpha.2 → 3.0.0-alpha.4

package/lib/client.d.ts

@@ -1,16 +1,16 @@
 export declare const collectExtractProps: (fileName: string, templateCodeRange: [number, number]) => Promise<{
-    name: string;
-    type: string;
-    model: boolean;
+	name: string;
+	type: string;
+	model: boolean;
 }[] | null | undefined>;
-export declare const getImportPathForFile: (fileName: string, incomingFileName: string, preferences: import("typescript").UserPreferences) => Promise<string | null | undefined>;
+export declare const getImportPathForFile: (fileName: string, incomingFileName: string, preferences: import('typescript').UserPreferences) => Promise<string | null | undefined>;
 export declare const getPropertiesAtLocation: (fileName: string, position: number) => Promise<string[] | null | undefined>;
 export declare const getQuickInfoAtPosition: (fileName: string, position: number) => Promise<string | null | undefined>;
-export declare function getComponentProps(fileName: string, componentName: string): Promise<import("./requests/getComponentProps").ComponentPropInfo[] | null | undefined>;
+export declare function getComponentProps(fileName: string, componentName: string): Promise<import('./requests/getComponentProps').ComponentPropInfo[] | null | undefined>;
 export declare const getComponentEvents: (fileName: string, tag: string) => Promise<string[] | null | undefined>;
 export declare const getComponentDirectives: (fileName: string) => Promise<string[] | null | undefined>;
 export declare function getComponentNames(fileName: string): Promise<string[] | undefined>;
 export declare const getElementAttrs: (fileName: string, tagName: string) => Promise<{
-    name: string;
+	name: string;
 }[] | null | undefined>;
 export declare const getSlotNames: (fileName: string) => Promise<string[] | null | undefined>;

package/lib/common.js

@@ -151,6 +151,15 @@ function getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, as
         }
         const definitions = new Set(result.definitions);
         const skippedDefinitions = [];
+        // #5275
+        if (result.definitions.length >= 2) {
+            for (const definition of result.definitions) {
+                if (root.sfc.content[definition.textSpan.start - 1] === '@'
+                    || root.sfc.content.slice(definition.textSpan.start - 5, definition.textSpan.start) === 'v-on:') {
+                    skippedDefinitions.push(definition);
+                }
+            }
+        }
         for (const definition of result.definitions) {
             if (vueOptions.extensions.some(ext => definition.fileName.endsWith(ext))) {
                 continue;

package/lib/requests/getComponentProps.js

@@ -10,8 +10,6 @@ function getComponentProps(fileName, tag) {
         return;
     }
     const vueCode = volarFile.generated.root;
-    const program = languageService.getProgram();
-    const checker = program.getTypeChecker();
     const components = (0, utils_1.getVariableType)(ts, languageService, vueCode, '__VLS_components');
     if (!components) {
         return [];
@@ -21,21 +19,15 @@ function getComponentProps(fileName, tag) {
         return [];
     }
     const result = new Map();
+    const program = languageService.getProgram();
+    const checker = program.getTypeChecker();
     for (const sig of componentType.getCallSignatures()) {
         const propParam = sig.parameters[0];
         if (propParam) {
             const propsType = checker.getTypeOfSymbolAtLocation(propParam, components.node);
             const props = propsType.getProperties();
             for (const prop of props) {
-                const name = prop.name;
-                const required = !(prop.flags & ts.SymbolFlags.Optional) || undefined;
-                const { content: commentMarkdown, deprecated } = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags());
-                result.set(name, {
-                    name,
-                    required,
-                    deprecated,
-                    commentMarkdown
-                });
+                handlePropSymbol(prop);
             }
         }
     }
@@ -46,22 +38,37 @@ function getComponentProps(fileName, tag) {
             const propsType = checker.getTypeOfSymbolAtLocation(propsSymbol, components.node);
             const props = propsType.getProperties();
             for (const prop of props) {
-                if (prop.flags & ts.SymbolFlags.Method) { // #2443
-                    continue;
-                }
-                const name = prop.name;
-                const required = !(prop.flags & ts.SymbolFlags.Optional) || undefined;
-                const { content: commentMarkdown, deprecated } = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags());
-                result.set(name, {
-                    name,
-                    required,
-                    deprecated,
-                    commentMarkdown
-                });
+                handlePropSymbol(prop);
             }
         }
     }
     return [...result.values()];
+    function handlePropSymbol(prop) {
+        if (prop.flags & ts.SymbolFlags.Method) { // #2443
+            return;
+        }
+        const name = prop.name;
+        const required = !(prop.flags & ts.SymbolFlags.Optional) || undefined;
+        const { content: commentMarkdown, deprecated, } = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags());
+        const values = [];
+        const type = checker.getTypeOfSymbol(prop);
+        const subTypes = type.types;
+        if (subTypes) {
+            for (const subType of subTypes) {
+                const value = subType.value;
+                if (value) {
+                    values.push(value);
+                }
+            }
+        }
+        result.set(name, {
+            name,
+            required,
+            deprecated,
+            commentMarkdown,
+            values,
+        });
+    }
 }
 function generateCommentMarkdown(parts, jsDocTags) {
     const parsedComment = _symbolDisplayPartsToMarkdown(parts);

package/lib/requests/getSlotNames.d.ts

@@ -1,6 +1,6 @@
 import type { RequestContext } from './types';
 export interface ElementAttrInfo {
-    name: string;
-    values?: string[];
+	name: string;
+	values?: string[];
 }
 export declare function getSlotNames(this: RequestContext, fileName: string): string[] | undefined;

package/lib/server.d.ts

@@ -3,23 +3,23 @@ import type * as ts from 'typescript';
 export type RequestType = 'containsFile' | 'projectInfo' | 'collectExtractProps' | 'getImportPathForFile' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'subscribeComponentProps' | 'getComponentEvents' | 'getComponentDirectives' | 'getElementAttrs' | 'getSlotNames';
 export type NotificationType = 'componentNamesUpdated' | 'componentPropsUpdated';
 export type RequestData = [
-    seq: number,
-    type: RequestType,
-    fileName: string,
-    ...args: any[]
+	seq: number,
+	type: RequestType,
+	fileName: string,
+	...args: any[],
 ];
 export type ResponseData = [
-    seq: number,
-    data: any
+	seq: number,
+	data: any,
 ];
 export type NotificationData = [
-    type: NotificationType,
-    fileName: string,
-    data: any
+	type: NotificationType,
+	fileName: string,
+	data: any,
 ];
 export interface ProjectInfo {
-    name: string;
-    kind: ts.server.ProjectKind;
-    currentDirectory: string;
+	name: string;
+	kind: ts.server.ProjectKind;
+	currentDirectory: string;
 }
 export declare function startNamedPipeServer(ts: typeof import('typescript'), info: ts.server.PluginCreateInfo, language: Language<string>, projectKind: ts.server.ProjectKind.Inferred | ts.server.ProjectKind.Configured): Promise<void>;

package/lib/utils.d.ts

@@ -6,24 +6,24 @@ import type { NotificationData, ProjectInfo, RequestData } from './server';
 export { TypeScriptProjectHost } from '@volar/typescript';
 export declare function getServerPath(kind: ts.server.ProjectKind, id: number): string;
 declare class NamedPipeServer {
-    path: string;
-    connecting: boolean;
-    projectInfo?: ProjectInfo;
-    containsFileCache: Map<string, Promise<boolean | null | undefined>>;
-    componentNamesAndProps: FileMap<Record<string, ComponentPropInfo[] | null>>;
-    constructor(kind: ts.server.ProjectKind, id: number);
-    containsFile(fileName: string): Promise<boolean | null | undefined> | undefined;
-    getComponentProps(fileName: string, tag: string): Promise<ComponentPropInfo[] | null | undefined>;
-    update(): void;
-    connect(): void;
-    close(): void;
-    socket?: net.Socket;
-    seq: number;
-    dataChunks: Buffer[];
-    requestHandlers: Map<number, (res: any) => void>;
-    onData(chunk: Buffer): void;
-    onNotification(type: NotificationData[0], fileName: string, data: any): void;
-    sendRequest<T>(requestType: RequestData[1], fileName: string, ...args: any[]): Promise<T | null | undefined>;
+	path: string;
+	connecting: boolean;
+	projectInfo?: ProjectInfo;
+	containsFileCache: Map<string, Promise<boolean | null | undefined>>;
+	componentNamesAndProps: FileMap<Record<string, ComponentPropInfo[] | null>>;
+	constructor(kind: ts.server.ProjectKind, id: number);
+	containsFile(fileName: string): Promise<boolean | null | undefined> | undefined;
+	getComponentProps(fileName: string, tag: string): Promise<ComponentPropInfo[] | null | undefined>;
+	update(): void;
+	connect(): void;
+	close(): void;
+	socket?: net.Socket;
+	seq: number;
+	dataChunks: Buffer[];
+	requestHandlers: Map<number, (res: any) => void>;
+	onData(chunk: Buffer): void;
+	onNotification(type: NotificationData[0], fileName: string, data: any): void;
+	sendRequest<T>(requestType: RequestData[1], fileName: string, ...args: any[]): Promise<T | null | undefined>;
 }
 export declare const configuredServers: NamedPipeServer[];
 export declare const inferredServers: NamedPipeServer[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.0-alpha.2",
+	"version": "3.0.0-alpha.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,11 +14,13 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "3.0.0-alpha.2",
-		"@vue/shared": "^3.5.0"
+		"@vue/language-core": "3.0.0-alpha.4",
+		"@vue/shared": "^3.5.0",
+		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
-		"@types/node": "^22.10.4"
+		"@types/node": "^22.10.4",
+		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "79247b7c24b7202ec676723440fdb36c38e6d450"
+	"gitHead": "1769cd6b94ec9e0cc2681b8dbba904f35856ba1c"
 }