@vue/typescript-plugin 2.2.8 → 2.2.12

package/lib/common.js

@@ -5,6 +5,7 @@ exports.getComponentSpans = getComponentSpans;
 const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const getComponentNames_1 = require("./requests/getComponentNames");
+const getElementAttrs_1 = require("./requests/getElementAttrs");
 const windowsPathReg = /\\/g;
 function proxyLanguageServiceForVue(ts, language, languageService, vueOptions, asScriptId) {
     const proxyCache = new Map();
@@ -191,6 +192,7 @@ function getComponentSpans(vueCode, template, spanTemplateRange) {
     const { typescript: ts, languageService } = this;
     const result = [];
     const validComponentNames = (0, getComponentNames_1._getComponentNames)(ts, languageService, vueCode);
+    const elements = new Set((0, getElementAttrs_1._getElementNames)(ts, languageService, vueCode));
     const components = new Set([
         ...validComponentNames,
         ...validComponentNames.map(language_core_1.hyphenateTag),
@@ -200,7 +202,7 @@ function getComponentSpans(vueCode, template, spanTemplateRange) {
             if (node.loc.end.offset <= spanTemplateRange.start || node.loc.start.offset >= (spanTemplateRange.start + spanTemplateRange.length)) {
                 continue;
             }
-            if (components.has(node.tag)) {
+            if (components.has(node.tag) && !elements.has(node.tag)) {
                 let start = node.loc.start.offset;
                 if (template.lang === 'html') {
                     start += '<'.length;

package/lib/requests/getElementAttrs.d.ts

@@ -1,2 +1,5 @@
+import { VueVirtualCode } from '@vue/language-core';
+import type * as ts from 'typescript';
 import type { RequestContext } from './types';
 export declare function getElementAttrs(this: RequestContext, fileName: string, tagName: string): string[] | undefined;
+export declare function _getElementNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: VueVirtualCode): string[];

package/lib/requests/getElementAttrs.js

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementAttrs = getElementAttrs;
-const vue = require("@vue/language-core");
+exports._getElementNames = _getElementNames;
+const language_core_1 = require("@vue/language-core");
 function getElementAttrs(fileName, tagName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
+    if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }
     const program = languageService.getProgram();
-    let tsSourceFile;
-    if (tsSourceFile = program.getSourceFile(fileName)) {
+    const tsSourceFile = program.getSourceFile(fileName);
+    if (tsSourceFile) {
         const checker = program.getTypeChecker();
         const typeNode = tsSourceFile.statements
             .filter(ts.isTypeAliasDeclaration)
             .find(node => node.name.getText() === '__VLS_IntrinsicElementsCompletion');
-        if (checker && typeNode) {
+        if (typeNode) {
             const type = checker.getTypeFromTypeNode(typeNode.type);
             const el = type.getProperty(tagName);
             if (el) {
@@ -26,4 +27,19 @@ function getElementAttrs(fileName, tagName) {
     }
     return [];
 }
+function _getElementNames(ts, tsLs, vueCode) {
+    const program = tsLs.getProgram();
+    const tsSourceFile = program.getSourceFile(vueCode.fileName);
+    if (tsSourceFile) {
+        const checker = program.getTypeChecker();
+        const typeNode = tsSourceFile.statements
+            .filter(ts.isTypeAliasDeclaration)
+            .find(node => node.name.getText() === '__VLS_IntrinsicElementsCompletion');
+        if (typeNode) {
+            const type = checker.getTypeFromTypeNode(typeNode.type);
+            return type.getProperties().map(c => c.name);
+        }
+    }
+    return [];
+}
 //# sourceMappingURL=getElementAttrs.js.map

package/lib/requests/utils.js

@@ -36,11 +36,11 @@ function getSelfComponentName(fileName) {
 }
 function getVariableType(ts, languageService, vueCode, name) {
     const program = languageService.getProgram();
-    let tsSourceFile;
-    if (tsSourceFile = program.getSourceFile(vueCode.fileName)) {
-        const node = searchVariableDeclarationNode(ts, tsSourceFile, name);
+    const tsSourceFile = program.getSourceFile(vueCode.fileName);
+    if (tsSourceFile) {
         const checker = program.getTypeChecker();
-        if (checker && node) {
+        const node = searchVariableDeclarationNode(ts, tsSourceFile, name);
+        if (node) {
             return {
                 node: node,
                 type: checker.getTypeAtLocation(node),
@@ -49,15 +49,15 @@ function getVariableType(ts, languageService, vueCode, name) {
     }
 }
 function searchVariableDeclarationNode(ts, sourceFile, name) {
-    let componentsNode;
+    let result;
     walk(sourceFile);
-    return componentsNode;
+    return result;
     function walk(node) {
-        if (componentsNode) {
+        if (result) {
             return;
         }
         else if (ts.isVariableDeclaration(node) && node.name.getText() === name) {
-            componentsNode = node;
+            result = node;
         }
         else {
             node.forEachChild(walk);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.2.8",
+	"version": "2.2.12",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,12 +13,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.11",
-		"@vue/language-core": "2.2.8",
+		"@volar/typescript": "2.4.15",
+		"@vue/language-core": "2.2.12",
 		"@vue/shared": "^3.5.0"
 	},
 	"devDependencies": {
 		"@types/node": "^22.10.4"
 	},
-	"gitHead": "cdf00e6f19971260607ea2347924b94126a254fc"
+	"gitHead": "0b13bf1966398ea3949b6b02d09b251ddc9a51eb"
 }

package/lib/requests/componentInfos.d.ts

@@ -1,13 +0,0 @@
-import * as vue from '@vue/language-core';
-import type * as ts from 'typescript';
-import type { RequestContext } from './types';
-export declare function getComponentProps(this: RequestContext, fileName: string, tag: string): {
-    name: string;
-    required?: true;
-    commentMarkdown?: string;
-}[] | undefined;
-export declare function getComponentEvents(this: RequestContext, fileName: string, tag: 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

@@ -1,249 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getComponentProps = getComponentProps;
-exports.getComponentEvents = getComponentEvents;
-exports.getTemplateContextProps = getTemplateContextProps;
-exports.getComponentNames = getComponentNames;
-exports._getComponentNames = _getComponentNames;
-exports.getElementAttrs = getElementAttrs;
-const vue = require("@vue/language-core");
-const shared_1 = require("@vue/shared");
-function getComponentProps(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 program = languageService.getProgram();
-    const checker = program.getTypeChecker();
-    const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
-    if (!components) {
-        return [];
-    }
-    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];
-        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 commentMarkdown = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags()) || undefined;
-                result.set(name, { name, required, commentMarkdown });
-            }
-        }
-    }
-    for (const sig of componentType.getConstructSignatures()) {
-        const instanceType = sig.getReturnType();
-        const propsSymbol = instanceType.getProperty('$props');
-        if (propsSymbol) {
-            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 commentMarkdown = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags()) || undefined;
-                result.set(name, { name, required, commentMarkdown });
-            }
-        }
-    }
-    return [...result.values()];
-}
-function getComponentEvents(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 program = languageService.getProgram();
-    const checker = program.getTypeChecker();
-    const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
-    if (!components) {
-        return [];
-    }
-    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];
-    // 	if (emitParam) {
-    // 		// TODO
-    // 	}
-    // }
-    for (const sig of componentType.getConstructSignatures()) {
-        const instanceType = sig.getReturnType();
-        const emitSymbol = instanceType.getProperty('$emit');
-        if (emitSymbol) {
-            const emitType = checker.getTypeOfSymbolAtLocation(emitSymbol, components.node);
-            for (const call of emitType.getCallSignatures()) {
-                const eventNameParamSymbol = call.parameters[0];
-                if (eventNameParamSymbol) {
-                    const eventNameParamType = checker.getTypeOfSymbolAtLocation(eventNameParamSymbol, components.node);
-                    if (eventNameParamType.isStringLiteral()) {
-                        result.add(eventNameParamType.value);
-                    }
-                }
-            }
-        }
-    }
-    return [...result];
-}
-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;
-    return getVariableType(ts, languageService, vueCode, '__VLS_ctx')
-        ?.type
-        ?.getProperties()
-        .map(c => c.name);
-}
-function getComponentNames(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;
-    return getVariableType(ts, languageService, vueCode, '__VLS_components')
-        ?.type
-        ?.getProperties()
-        .map(c => c.name)
-        .filter(entry => !entry.includes('$') && !entry.startsWith('_'))
-        ?? [];
-}
-function _getComponentNames(ts, tsLs, vueCode) {
-    return getVariableType(ts, tsLs, vueCode, '__VLS_components')
-        ?.type
-        ?.getProperties()
-        .map(c => c.name)
-        .filter(entry => !entry.includes('$') && !entry.startsWith('_'))
-        ?? [];
-}
-function getElementAttrs(fileName, tagName) {
-    const { typescript: ts, language, languageService, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
-        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');
-        const checker = program.getTypeChecker();
-        if (checker && typeNode) {
-            const type = checker.getTypeFromTypeNode(typeNode.type);
-            const el = type.getProperty(tagName);
-            if (el) {
-                const attrs = checker.getTypeOfSymbolAtLocation(el, typeNode).getProperties();
-                return attrs.map(c => c.name);
-            }
-        }
-    }
-    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);
-        const checker = program.getTypeChecker();
-        if (checker && node) {
-            return {
-                node: node,
-                type: checker.getTypeAtLocation(node),
-            };
-        }
-    }
-}
-function searchVariableDeclarationNode(ts, sourceFile, name) {
-    let componentsNode;
-    walk(sourceFile);
-    return componentsNode;
-    function walk(node) {
-        if (componentsNode) {
-            return;
-        }
-        else if (ts.isVariableDeclaration(node) && node.name.getText() === name) {
-            componentsNode = node;
-        }
-        else {
-            node.forEachChild(walk);
-        }
-    }
-}
-function generateCommentMarkdown(parts, jsDocTags) {
-    const parsedComment = _symbolDisplayPartsToMarkdown(parts);
-    const parsedJsDoc = _jsDocTagInfoToMarkdown(jsDocTags);
-    let result = [parsedComment, parsedJsDoc].filter(str => !!str).join('\n\n');
-    return result;
-}
-function _symbolDisplayPartsToMarkdown(parts) {
-    return parts.map(part => {
-        switch (part.kind) {
-            case 'keyword':
-                return `\`${part.text}\``;
-            case 'functionName':
-                return `**${part.text}**`;
-            default:
-                return part.text;
-        }
-    }).join('');
-}
-function _jsDocTagInfoToMarkdown(jsDocTags) {
-    return jsDocTags.map(tag => {
-        const tagName = `*@${tag.name}*`;
-        const tagText = tag.text?.map(t => {
-            if (t.kind === 'parameterName') {
-                return `\`${t.text}\``;
-            }
-            else {
-                return t.text;
-            }
-        }).join('') || '';
-        return `${tagName} ${tagText}`;
-    }).join('\n\n');
-}
-//# sourceMappingURL=componentInfos.js.map

package/lib/requests/getComponentInfo.d.ts

@@ -1,5 +0,0 @@
-import type { RequestContext } from './types';
-export declare function getComponentInfo(this: RequestContext, fileName: string, tag: string): {
-    props: import("./getComponentProps").ComponentPropInfo[] | undefined;
-    events: string[] | undefined;
-};

package/lib/requests/getComponentInfo.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getComponentInfo = getComponentInfo;
-const shared_1 = require("@vue/shared");
-const getComponentEvents_1 = require("./getComponentEvents");
-const getComponentProps_1 = require("./getComponentProps");
-const globalProperties = [
-    'key',
-    'ref',
-    'ref_for',
-    'ref_key',
-    'class',
-    'style'
-];
-function getComponentInfo(fileName, tag) {
-    const props = getComponentProps_1.getComponentProps.call(this, fileName, tag, true)?.filter(({ name }) => !globalProperties.includes(name) && !(0, shared_1.hyphenate)(name).startsWith('on-vnode-'));
-    const events = getComponentEvents_1.getComponentEvents.call(this, fileName, tag);
-    return {
-        props,
-        events,
-    };
-}
-//# sourceMappingURL=getComponentInfo.js.map