@vue/typescript-plugin 2.2.2 → 2.2.6

package/lib/common.js

@@ -102,7 +102,7 @@ function getCompletionEntryDetails(language, asScriptId, getCompletionEntryDetai
             const { fileName } = args[6]?.__isAutoImport;
             const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
-                const sfc = sourceScript.generated.root._vueSfc();
+                const sfc = sourceScript.generated.root.vueSfc;
                 if (!sfc?.descriptor.script && !sfc?.descriptor.scriptSetup) {
                     for (const codeAction of details?.codeActions ?? []) {
                         for (const change of codeAction.changes) {
@@ -173,7 +173,7 @@ function getEncodedSemanticClassifications(ts, language, languageService, asScri
         const sourceScript = language.scripts.get(asScriptId(fileName));
         const root = sourceScript?.generated?.root;
         if (root instanceof language_core_1.VueVirtualCode) {
-            const { template } = root._sfc;
+            const { template } = root.sfc;
             if (template) {
                 for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService }, root, template, {
                     start: span.start - template.startTagEnd,

package/lib/requests/collectExtractProps.js

@@ -18,7 +18,7 @@ function collectExtractProps(fileName, templateCodeRange) {
     const checker = program.getTypeChecker();
     const script = sourceScript.generated?.languagePlugin.typescript?.getServiceScript(root);
     const maps = script ? [...language.maps.forEach(script.code)].map(([_sourceScript, map]) => map) : [];
-    const sfc = root._sfc;
+    const { sfc } = root;
     sourceFile.forEachChild(function visit(node) {
         if (ts.isPropertyAccessExpression(node)
             && ts.isIdentifier(node.expression)

package/lib/requests/componentInfos.d.ts

@@ -1,15 +1,13 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
 import type { RequestContext } from './types';
-export interface ComponentPropInfo {
+export declare function getComponentProps(this: RequestContext, fileName: string, tag: string): {
     name: string;
-    required?: boolean;
-    deprecated?: boolean;
+    required?: true;
     commentMarkdown?: string;
-}
-export declare function getComponentProps(this: RequestContext, fileName: string, tag: string): ComponentPropInfo[] | undefined;
+}[] | undefined;
 export declare function getComponentEvents(this: RequestContext, fileName: string, tag: string): string[] | undefined;
-export declare function getComponentDirectives(this: RequestContext, fileName: string): string[] | undefined;
+export declare function getTemplateContextProps(this: RequestContext, fileName: string): string[] | undefined;
 export declare function getComponentNames(this: RequestContext, fileName: string): string[] | undefined;
 export declare function _getComponentNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: vue.VueVirtualCode): string[];
 export declare function getElementAttrs(this: RequestContext, fileName: string, tagName: string): string[] | undefined;

package/lib/requests/componentInfos.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentProps = getComponentProps;
 exports.getComponentEvents = getComponentEvents;
-exports.getComponentDirectives = getComponentDirectives;
+exports.getTemplateContextProps = getTemplateContextProps;
 exports.getComponentNames = getComponentNames;
 exports._getComponentNames = _getComponentNames;
 exports.getElementAttrs = getElementAttrs;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
-const path = require("node:path");
 function getComponentProps(fileName, tag) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
@@ -22,10 +21,23 @@ function getComponentProps(fileName, tag) {
     if (!components) {
         return [];
     }
-    const componentType = getComponentType(ts, languageService, vueCode, components, fileName, tag);
-    if (!componentType) {
+    const name = tag.split('.');
+    let componentSymbol = components.type.getProperty(name[0])
+        ?? components.type.getProperty((0, shared_1.camelize)(name[0]))
+        ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
+    if (!componentSymbol) {
         return [];
     }
+    let componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
+    for (let i = 1; i < name.length; i++) {
+        componentSymbol = componentType.getProperty(name[i]);
+        if (componentSymbol) {
+            componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
+        }
+        else {
+            return [];
+        }
+    }
     const result = new Map();
     for (const sig of componentType.getCallSignatures()) {
         const propParam = sig.parameters[0];
@@ -35,13 +47,8 @@ function getComponentProps(fileName, tag) {
             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
-                });
+                const commentMarkdown = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags()) || undefined;
+                result.set(name, { name, required, commentMarkdown });
             }
         }
     }
@@ -57,13 +64,8 @@ function getComponentProps(fileName, tag) {
                 }
                 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
-                });
+                const commentMarkdown = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags()) || undefined;
+                result.set(name, { name, required, commentMarkdown });
             }
         }
     }
@@ -82,10 +84,25 @@ function getComponentEvents(fileName, tag) {
     if (!components) {
         return [];
     }
-    const componentType = getComponentType(ts, languageService, vueCode, components, fileName, tag);
-    if (!componentType) {
+    const name = tag.split('.');
+    let componentSymbol = components.type.getProperty(name[0]);
+    if (!componentSymbol) {
+        componentSymbol = components.type.getProperty((0, shared_1.camelize)(name[0]))
+            ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
+    }
+    if (!componentSymbol) {
         return [];
     }
+    let componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
+    for (let i = 1; i < name.length; i++) {
+        componentSymbol = componentType.getProperty(name[i]);
+        if (componentSymbol) {
+            componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
+        }
+        else {
+            return [];
+        }
+    }
     const result = new Set();
     // for (const sig of componentType.getCallSignatures()) {
     // 	const emitParam = sig.parameters[1];
@@ -111,21 +128,17 @@ function getComponentEvents(fileName, tag) {
     }
     return [...result];
 }
-function getComponentDirectives(fileName) {
+function getTemplateContextProps(fileName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
     if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const vueCode = volarFile.generated.root;
-    const directives = getVariableType(ts, languageService, vueCode, '__VLS_directives');
-    if (!directives) {
-        return [];
-    }
-    return directives.type.getProperties()
-        .map(({ name }) => name)
-        .filter(name => name.startsWith('v') && name.length >= 2 && name[1] === name[1].toUpperCase())
-        .filter(name => !['vBind', 'vIf', 'vOn', 'VOnce', 'vShow', 'VSlot'].includes(name));
+    return getVariableType(ts, languageService, vueCode, '__VLS_ctx')
+        ?.type
+        ?.getProperties()
+        .map(c => c.name);
 }
 function getComponentNames(fileName) {
     const { typescript: ts, language, languageService, getFileId } = this;
@@ -134,17 +147,20 @@ function getComponentNames(fileName) {
         return;
     }
     const vueCode = volarFile.generated.root;
-    return _getComponentNames(ts, languageService, vueCode);
+    return getVariableType(ts, languageService, vueCode, '__VLS_components')
+        ?.type
+        ?.getProperties()
+        .map(c => c.name)
+        .filter(entry => !entry.includes('$') && !entry.startsWith('_'))
+        ?? [];
 }
 function _getComponentNames(ts, tsLs, vueCode) {
-    const names = getVariableType(ts, tsLs, vueCode, '__VLS_components')
+    return getVariableType(ts, tsLs, vueCode, '__VLS_components')
         ?.type
         ?.getProperties()
         .map(c => c.name)
         .filter(entry => !entry.includes('$') && !entry.startsWith('_'))
         ?? [];
-    names.push(getSelfComponentName(vueCode.fileName));
-    return names;
 }
 function getElementAttrs(fileName, tagName) {
     const { typescript: ts, language, languageService, getFileId } = this;
@@ -155,9 +171,7 @@ function getElementAttrs(fileName, tagName) {
     const program = languageService.getProgram();
     let tsSourceFile;
     if (tsSourceFile = program.getSourceFile(fileName)) {
-        const typeNode = tsSourceFile.statements
-            .filter(ts.isTypeAliasDeclaration)
-            .find(node => node.name.getText() === '__VLS_IntrinsicElementsCompletion');
+        const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === '__VLS_IntrinsicElementsCompletion');
         const checker = program.getTypeChecker();
         if (checker && typeNode) {
             const type = checker.getTypeFromTypeNode(typeNode.type);
@@ -170,31 +184,6 @@ function getElementAttrs(fileName, tagName) {
     }
     return [];
 }
-function getComponentType(ts, languageService, vueCode, components, fileName, tag) {
-    const program = languageService.getProgram();
-    const checker = program.getTypeChecker();
-    const name = tag.split('.');
-    let componentSymbol = components.type.getProperty(name[0])
-        ?? components.type.getProperty((0, shared_1.camelize)(name[0]))
-        ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
-    let componentType;
-    if (!componentSymbol) {
-        const name = getSelfComponentName(fileName);
-        if (name === (0, shared_1.capitalize)((0, shared_1.camelize)(tag))) {
-            componentType = getVariableType(ts, languageService, vueCode, '__VLS_self')?.type;
-        }
-    }
-    else {
-        componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
-        for (let i = 1; i < name.length; i++) {
-            componentSymbol = componentType.getProperty(name[i]);
-            if (componentSymbol) {
-                componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
-            }
-        }
-    }
-    return componentType;
-}
 function getVariableType(ts, languageService, vueCode, name) {
     const program = languageService.getProgram();
     let tsSourceFile;
@@ -209,10 +198,6 @@ function getVariableType(ts, languageService, vueCode, name) {
         }
     }
 }
-function getSelfComponentName(fileName) {
-    const baseName = path.basename(fileName);
-    return (0, shared_1.capitalize)((0, shared_1.camelize)(baseName.slice(0, baseName.lastIndexOf('.'))));
-}
 function searchVariableDeclarationNode(ts, sourceFile, name) {
     let componentsNode;
     walk(sourceFile);
@@ -232,12 +217,8 @@ function searchVariableDeclarationNode(ts, sourceFile, name) {
 function generateCommentMarkdown(parts, jsDocTags) {
     const parsedComment = _symbolDisplayPartsToMarkdown(parts);
     const parsedJsDoc = _jsDocTagInfoToMarkdown(jsDocTags);
-    const content = [parsedComment, parsedJsDoc].filter(str => !!str).join('\n\n');
-    const deprecated = jsDocTags.some(tag => tag.name === 'deprecated');
-    return {
-        content,
-        deprecated
-    };
+    let result = [parsedComment, parsedJsDoc].filter(str => !!str).join('\n\n');
+    return result;
 }
 function _symbolDisplayPartsToMarkdown(parts) {
     return parts.map(part => {

package/lib/utils.js

@@ -153,7 +153,9 @@ class NamedPipeServer {
         else if (type === 'componentPropsUpdated') {
             const components = this.componentNamesAndProps.get(fileName) ?? {};
             const [name, props] = data;
-            components[name] = props;
+            if (name in components) {
+                components[name] = props;
+            }
         }
         else {
             console.error('Unknown notification type:', type);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.2.2",
+	"version": "2.2.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,11 +14,11 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "2.2.2",
+		"@vue/language-core": "2.2.6",
 		"@vue/shared": "^3.5.0"
 	},
 	"devDependencies": {
 		"@types/node": "^22.10.4"
 	},
-	"gitHead": "30757908b67f40f779c36795665163634fb81868"
+	"gitHead": "f2088e256dc0220db9549d28d9f865a5711dcfbe"
 }

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript';
-declare const plugin: ts.server.PluginModuleFactory;
-export default plugin;

package/lib/index.js

@@ -1,39 +0,0 @@
-import { createLanguageServicePlugin } from '@volar/typescript/lib/quickstart/createLanguageServicePlugin';
-import * as vue from '@vue/language-core';
-import { proxyLanguageServiceForVue } from './common';
-import { startNamedPipeServer } from './server';
-const windowsPathReg = /\\/g;
-const vueCompilerOptions = new WeakMap();
-const plugin = createLanguageServicePlugin((ts, info) => {
-    const vueOptions = getVueCompilerOptions();
-    const languagePlugin = vue.createVueLanguagePlugin(ts, info.languageServiceHost.getCompilationSettings(), vueOptions, id => id);
-    vueCompilerOptions.set(info.project, vueOptions);
-    return {
-        languagePlugins: [languagePlugin],
-        setup: language => {
-            info.languageService = proxyLanguageServiceForVue(ts, language, info.languageService, vueOptions, fileName => fileName);
-            if (info.project.projectKind === ts.server.ProjectKind.Configured
-                || info.project.projectKind === ts.server.ProjectKind.Inferred) {
-                startNamedPipeServer(ts, info, language, info.project.projectKind);
-            }
-            // #3963
-            const timer = setInterval(() => {
-                if (info.project['program']) {
-                    clearInterval(timer);
-                    info.project['program'].__vue__ = { language };
-                }
-            }, 50);
-        }
-    };
-    function getVueCompilerOptions() {
-        if (info.project.projectKind === ts.server.ProjectKind.Configured) {
-            const tsconfig = info.project.getProjectName();
-            return vue.createParsedCommandLine(ts, ts.sys, tsconfig.replace(windowsPathReg, '/')).vueOptions;
-        }
-        else {
-            return vue.createParsedCommandLineByJson(ts, ts.sys, info.languageServiceHost.getCurrentDirectory(), {}).vueOptions;
-        }
-    }
-});
-export default plugin;
-//# sourceMappingURL=index.js.map

package/lib/requests/getSlotNames.d.ts

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

package/lib/requests/getSlotNames.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSlotNames = getSlotNames;
-const language_core_1 = require("@vue/language-core");
-function getSlotNames(fileName) {
-    const { typescript: ts, language, languageService, getFileId } = this;
-    const sourceScript = language.scripts.get(getFileId(fileName));
-    if (!sourceScript?.generated) {
-        return;
-    }
-    const root = sourceScript.generated.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const program = languageService.getProgram();
-    const tsSourceFile = program.getSourceFile(fileName);
-    if (!tsSourceFile) {
-        return;
-    }
-    const checker = program.getTypeChecker();
-    const typeNode = tsSourceFile.statements
-        .filter(ts.isTypeAliasDeclaration)
-        .find(node => node.name.getText() === '__VLS_Slots');
-    if (typeNode) {
-        const attrs = checker.getTypeFromTypeNode(typeNode.type).getProperties();
-        return attrs.map(attr => attr.name);
-    }
-    return [];
-}
-//# sourceMappingURL=getSlotNames.js.map

package/lib/requests/goToDefinition.d.ts

@@ -1,2 +0,0 @@
-import type { RequestContext } from './types';
-export declare function goToDefinition(this: RequestContext, fileName: string, tag: string): string | undefined;

package/lib/requests/goToDefinition.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.goToDefinition = goToDefinition;
-const vue = require("@vue/language-core");
-const componentInfos_1 = require("./componentInfos");
-function goToDefinition(fileName, tag) {
-    const { typescript: ts, language, languageService, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
-        return;
-    }
-    const vueCode = volarFile.generated.root;
-    const components = (0, componentInfos_1.getVariableType)(ts, languageService, vueCode, '__VLS_components');
-    if (!components) {
-        return '';
-    }
-    const componentType = (0, componentInfos_1.getComponentType)(ts, languageService, vueCode, components, fileName, tag);
-    if (!componentType) {
-        return '';
-    }
-    const decls = componentType.symbol.declarations ?? [];
-    for (const decl of decls) {
-        return decl.getSourceFile().fileName;
-    }
-}
-//# sourceMappingURL=goToDefinition.js.map