@vue/language-service 3.0.0-alpha.2 → 3.0.0-alpha.4

package/lib/plugins/vue-sfc.js

@@ -193,7 +193,9 @@ function create() {
                     if (!result) {
                         return;
                     }
-                    result.items = result.items.filter(item => item.label !== '!DOCTYPE' && item.label !== 'Custom Blocks');
+                    result.items = result.items.filter(item => item.label !== '!DOCTYPE' &&
+                        item.label !== 'Custom Blocks' &&
+                        item.label !== 'data-');
                     const tags = sfcDataProvider?.provideTags();
                     const scriptLangs = getLangs('script');
                     const scriptItems = result.items.filter(item => item.label === 'script' || item.label === 'script setup');

package/lib/plugins/vue-template.js

@@ -247,14 +247,19 @@ function create(mode, getTsPluginClient) {
                                 return [];
                             }
                             const { attrs, propInfos, events, directives } = tagInfo;
-                            const props = propInfos.map(prop => (0, language_core_1.hyphenateTag)(prop.name).startsWith('on-vnode-')
-                                ? 'onVue:' + prop.name.slice('onVnode'.length)
-                                : prop.name);
+                            for (const prop of propInfos) {
+                                if ((0, language_core_1.hyphenateTag)(prop.name).startsWith('on-vnode-')) {
+                                    prop.name = 'onVue:' + prop.name.slice('onVnode'.length);
+                                }
+                            }
                             const attributes = [];
-                            const propsSet = new Set(props);
-                            for (const prop of [...props, ...attrs]) {
-                                const isGlobal = !propsSet.has(prop);
-                                const name = casing.attr === types_1.AttrNameCasing.Camel ? prop : (0, language_core_1.hyphenateAttr)(prop);
+                            const propsSet = new Set(propInfos.map(prop => prop.name));
+                            for (const prop of [
+                                ...propInfos,
+                                ...attrs.map(attr => ({ name: attr })),
+                            ]) {
+                                const isGlobal = !propsSet.has(prop.name);
+                                const name = casing.attr === types_1.AttrNameCasing.Camel ? prop.name : (0, language_core_1.hyphenateAttr)(prop.name);
                                 const isEvent = (0, language_core_1.hyphenateAttr)(name).startsWith('on-');
                                 if (isEvent) {
                                     const propNameBase = name.startsWith('on-')
@@ -282,6 +287,7 @@ function create(mode, getTsPluginClient) {
                                     attributes.push({
                                         name: propName,
                                         description: propKey,
+                                        valueSet: prop.values?.some(value => typeof value === 'string') ? '__deferred__' : undefined,
                                     }, {
                                         name: ':' + propName,
                                         description: propKey,
@@ -309,10 +315,13 @@ function create(mode, getTsPluginClient) {
                                 });
                             }
                             const models = [];
-                            for (const prop of [...props, ...attrs]) {
-                                if (prop.startsWith('onUpdate:')) {
-                                    const isGlobal = !propsSet.has(prop);
-                                    models.push([isGlobal, prop.slice('onUpdate:'.length)]);
+                            for (const prop of [
+                                ...propInfos,
+                                ...attrs.map(attr => ({ name: attr })),
+                            ]) {
+                                if (prop.name.startsWith('onUpdate:')) {
+                                    const isGlobal = !propsSet.has(prop.name);
+                                    models.push([isGlobal, prop.name.slice('onUpdate:'.length)]);
                                 }
                             }
                             for (const event of events) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.0.0-alpha.2",
+	"version": "3.0.0-alpha.4",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -21,19 +21,19 @@
 		"@volar/language-service": "~2.4.11",
 		"@volar/typescript": "~2.4.11",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/language-core": "3.0.0-alpha.2",
+		"@vue/language-core": "3.0.0-alpha.4",
 		"@vue/shared": "^3.5.0",
-		"@vue/typescript-plugin": "3.0.0-alpha.2",
+		"@vue/typescript-plugin": "3.0.0-alpha.4",
 		"alien-signals": "^1.0.3",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.62",
-		"volar-service-emmet": "0.0.62",
-		"volar-service-html": "0.0.62",
-		"volar-service-json": "0.0.62",
-		"volar-service-pug": "0.0.62",
-		"volar-service-pug-beautify": "0.0.62",
-		"volar-service-typescript": "0.0.62",
-		"volar-service-typescript-twoslash-queries": "0.0.62",
+		"volar-service-css": "0.0.64",
+		"volar-service-emmet": "0.0.64",
+		"volar-service-html": "0.0.64",
+		"volar-service-json": "0.0.64",
+		"volar-service-pug": "0.0.64",
+		"volar-service-pug-beautify": "0.0.64",
+		"volar-service-typescript": "0.0.64",
+		"volar-service-typescript-twoslash-queries": "0.0.64",
 		"vscode-css-languageservice": "^6.3.1",
 		"vscode-html-languageservice": "^5.2.0",
 		"vscode-languageserver-textdocument": "^1.0.11",
@@ -45,5 +45,5 @@
 		"@volar/kit": "~2.4.11",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "79247b7c24b7202ec676723440fdb36c38e6d450"
+	"gitHead": "1769cd6b94ec9e0cc2681b8dbba904f35856ba1c"
 }

package/lib/ideFeatures/nameCasing.d.ts

@@ -1,14 +0,0 @@
-import type { LanguageServiceContext } from '@volar/language-service';
-import type * as vscode from 'vscode-languageserver-protocol';
-import type { URI } from 'vscode-uri';
-import { AttrNameCasing, TagNameCasing } from '../types';
-export declare function convertTagName(context: LanguageServiceContext, uri: URI, casing: TagNameCasing, tsPluginClient: typeof import('@vue/typescript-plugin/lib/client') | undefined): Promise<vscode.TextEdit[] | undefined>;
-export declare function convertAttrName(context: LanguageServiceContext, uri: URI, casing: AttrNameCasing, tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): Promise<vscode.TextEdit[] | undefined>;
-export declare function getNameCasing(context: LanguageServiceContext, uri: URI): Promise<{
-    tag: TagNameCasing;
-    attr: AttrNameCasing;
-}>;
-export declare function detect(context: LanguageServiceContext, uri: URI): Promise<{
-    tag: TagNameCasing[];
-    attr: AttrNameCasing[];
-}>;

package/lib/ideFeatures/nameCasing.js

@@ -1,202 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTagName = convertTagName;
-exports.convertAttrName = convertAttrName;
-exports.getNameCasing = getNameCasing;
-exports.detect = detect;
-const vue = require("@vue/language-core");
-const language_core_1 = require("@vue/language-core");
-const alien_signals_1 = require("alien-signals");
-const types_1 = require("../types");
-async function convertTagName(context, uri, casing, tsPluginClient) {
-    const sourceFile = context.language.scripts.get(uri);
-    if (!sourceFile) {
-        return;
-    }
-    const root = sourceFile?.generated?.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const { template } = root._sfc;
-    if (!template) {
-        return;
-    }
-    const document = context.documents.get(sourceFile.id, sourceFile.languageId, sourceFile.snapshot);
-    const edits = [];
-    const components = await tsPluginClient?.getComponentNames(root.fileName) ?? [];
-    const tags = getTemplateTagsAndAttrs(root);
-    for (const [tagName, { offsets }] of tags) {
-        const componentName = components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-        if (componentName) {
-            for (const offset of offsets) {
-                const start = document.positionAt(template.startTagEnd + offset);
-                const end = document.positionAt(template.startTagEnd + offset + tagName.length);
-                const range = { start, end };
-                if (casing === types_1.TagNameCasing.Kebab && tagName !== (0, language_core_1.hyphenateTag)(componentName)) {
-                    edits.push({ range, newText: (0, language_core_1.hyphenateTag)(componentName) });
-                }
-                if (casing === types_1.TagNameCasing.Pascal && tagName !== componentName) {
-                    edits.push({ range, newText: componentName });
-                }
-            }
-        }
-    }
-    return edits;
-}
-async function convertAttrName(context, uri, casing, tsPluginClient) {
-    const sourceFile = context.language.scripts.get(uri);
-    if (!sourceFile) {
-        return;
-    }
-    const root = sourceFile?.generated?.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const { template } = root._sfc;
-    if (!template) {
-        return;
-    }
-    const document = context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
-    const edits = [];
-    const components = await tsPluginClient?.getComponentNames(root.fileName) ?? [];
-    const tags = getTemplateTagsAndAttrs(root);
-    for (const [tagName, { attrs }] of tags) {
-        const componentName = components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-        if (componentName) {
-            const props = (await tsPluginClient?.getComponentProps(root.fileName, componentName) ?? []).map(prop => prop.name);
-            for (const [attrName, { offsets }] of attrs) {
-                const propName = props.find(prop => prop === attrName || (0, language_core_1.hyphenateAttr)(prop) === attrName);
-                if (propName) {
-                    for (const offset of offsets) {
-                        const start = document.positionAt(template.startTagEnd + offset);
-                        const end = document.positionAt(template.startTagEnd + offset + attrName.length);
-                        const range = { start, end };
-                        if (casing === types_1.AttrNameCasing.Kebab && attrName !== (0, language_core_1.hyphenateAttr)(propName)) {
-                            edits.push({ range, newText: (0, language_core_1.hyphenateAttr)(propName) });
-                        }
-                        if (casing === types_1.AttrNameCasing.Camel && attrName !== propName) {
-                            edits.push({ range, newText: propName });
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return edits;
-}
-async function getNameCasing(context, uri) {
-    const detected = await detect(context, uri);
-    const [attr, tag] = await Promise.all([
-        context.env.getConfiguration?.('vue.complete.casing.props', uri.toString()),
-        context.env.getConfiguration?.('vue.complete.casing.tags', uri.toString()),
-    ]);
-    const tagNameCasing = detected.tag.length === 1 && (tag === 'autoPascal' || tag === 'autoKebab') ? detected.tag[0] : (tag === 'autoKebab' || tag === 'kebab') ? types_1.TagNameCasing.Kebab : types_1.TagNameCasing.Pascal;
-    const attrNameCasing = detected.attr.length === 1 && (attr === 'autoCamel' || attr === 'autoKebab') ? detected.attr[0] : (attr === 'autoCamel' || attr === 'camel') ? types_1.AttrNameCasing.Camel : types_1.AttrNameCasing.Kebab;
-    return {
-        tag: tagNameCasing,
-        attr: attrNameCasing,
-    };
-}
-async function detect(context, uri) {
-    const rootFile = context.language.scripts.get(uri)?.generated?.root;
-    if (!(rootFile instanceof language_core_1.VueVirtualCode)) {
-        return {
-            tag: [],
-            attr: [],
-        };
-    }
-    return {
-        tag: await getTagNameCase(rootFile),
-        attr: getAttrNameCase(rootFile),
-    };
-    function getAttrNameCase(file) {
-        const tags = getTemplateTagsAndAttrs(file);
-        const result = [];
-        for (const [_, { attrs }] of tags) {
-            for (const [tagName] of attrs) {
-                // attrName
-                if (tagName !== (0, language_core_1.hyphenateTag)(tagName)) {
-                    result.push(types_1.AttrNameCasing.Camel);
-                    break;
-                }
-            }
-            for (const [tagName] of attrs) {
-                // attr-name
-                if (tagName.includes('-')) {
-                    result.push(types_1.AttrNameCasing.Kebab);
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-    function getTagNameCase(file) {
-        const result = new Set();
-        if (file._sfc.template?.ast) {
-            for (const element of vue.forEachElementNode(file._sfc.template.ast)) {
-                if (element.tagType === 1) {
-                    if (element.tag !== (0, language_core_1.hyphenateTag)(element.tag)) {
-                        // TagName
-                        result.add(types_1.TagNameCasing.Pascal);
-                    }
-                    else {
-                        // Tagname -> tagname
-                        // TagName -> tag-name
-                        result.add(types_1.TagNameCasing.Kebab);
-                    }
-                }
-            }
-        }
-        return [...result];
-    }
-}
-const map = new WeakMap();
-function getTemplateTagsAndAttrs(sourceFile) {
-    if (!map.has(sourceFile)) {
-        const getter = (0, alien_signals_1.computed)(() => {
-            if (!(sourceFile instanceof vue.VueVirtualCode)) {
-                return;
-            }
-            const ast = sourceFile._sfc.template?.ast;
-            const tags = new Map();
-            if (ast) {
-                for (const node of vue.forEachElementNode(ast)) {
-                    if (!tags.has(node.tag)) {
-                        tags.set(node.tag, { offsets: [], attrs: new Map() });
-                    }
-                    const tag = tags.get(node.tag);
-                    const startTagHtmlOffset = node.loc.start.offset + node.loc.source.indexOf(node.tag);
-                    const endTagHtmlOffset = node.loc.start.offset + node.loc.source.lastIndexOf(node.tag);
-                    tag.offsets.push(startTagHtmlOffset);
-                    if (!node.isSelfClosing) {
-                        tag.offsets.push(endTagHtmlOffset);
-                    }
-                    for (const prop of node.props) {
-                        let name;
-                        let offset;
-                        if (prop.type === 7
-                            && prop.arg?.type === 4
-                            && prop.arg.isStatic) {
-                            name = prop.arg.content;
-                            offset = prop.arg.loc.start.offset;
-                        }
-                        else if (prop.type === 6) {
-                            name = prop.name;
-                            offset = prop.loc.start.offset;
-                        }
-                        if (name !== undefined && offset !== undefined) {
-                            if (!tag.attrs.has(name)) {
-                                tag.attrs.set(name, { offsets: [] });
-                            }
-                            tag.attrs.get(name).offsets.push(offset);
-                        }
-                    }
-                }
-            }
-            return tags;
-        });
-        map.set(sourceFile, getter);
-    }
-    return map.get(sourceFile).get() ?? new Map();
-}
-//# sourceMappingURL=nameCasing.js.map