@vue/language-service 3.0.4 → 3.0.6

package/lib/plugins/vue-template.js

@@ -7,9 +7,9 @@ const volar_service_html_1 = require("volar-service-html");
 const volar_service_pug_1 = require("volar-service-pug");
 const html = require("vscode-html-languageservice");
 const vscode_uri_1 = require("vscode-uri");
+const data_1 = require("../data");
 const nameCasing_1 = require("../nameCasing");
-const data_1 = require("./data");
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const specialTags = new Set([
     'slot',
     'component',
@@ -25,7 +25,7 @@ const specialProps = new Set([
 ]);
 let builtInData;
 let modelData;
-function create(mode, tsPluginClient) {
+function create(languageId, { getComponentNames, getElementAttrs, getComponentProps, getComponentEvents, getComponentDirectives, getComponentSlots, }) {
     let customData = [];
     let extraCustomData = [];
     const onDidChangeCustomDataListeners = new Set();
@@ -37,7 +37,7 @@ function create(mode, tsPluginClient) {
             },
         };
     };
-    const baseService = mode === 'pug'
+    const baseService = languageId === 'jade'
         ? (0, volar_service_pug_1.create)({
             useDefaultDataProvider: false,
             getCustomData() {
@@ -60,9 +60,8 @@ function create(mode, tsPluginClient) {
             onDidChangeCustomData,
         });
     const htmlDataProvider = html.getDefaultHTMLDataProvider();
-    const languageId = mode === 'pug' ? 'jade' : 'html';
     return {
-        name: `vue-template (${mode})`,
+        name: `vue-template (${languageId})`,
         capabilities: {
             ...baseService.capabilities,
             completionProvider: {
@@ -183,7 +182,6 @@ function create(mode, tsPluginClient) {
                                 prop = {
                                     name,
                                     kind: 'prop',
-                                    isGlobal: true,
                                 };
                             }
                         }
@@ -191,7 +189,7 @@ function create(mode, tsPluginClient) {
                         if (prop) {
                             const { isEvent, propName } = getPropName(prop.name, prop.kind === 'event');
                             if (prop.kind === 'prop') {
-                                if (!prop.isGlobal || specialProps.has(propName)) {
+                                if (!prop.isGlobal) {
                                     item.kind = 5;
                                 }
                             }
@@ -201,7 +199,7 @@ function create(mode, tsPluginClient) {
                                     tokens.push('\u0004');
                                 }
                             }
-                            if (!prop.isGlobal || specialProps.has(propName)) {
+                            if (!prop.isGlobal) {
                                 tokens.push('\u0000');
                                 if (item.label.startsWith(':')) {
                                     tokens.push('\u0001');
@@ -244,6 +242,9 @@ function create(mode, tsPluginClient) {
                             tokens.push('\u0001');
                         }
                         item.sortText = tokens.join('') + (item.sortText ?? item.label);
+                        if (item.label === 'v-for') {
+                            item.textEdit.newText = item.label + '="${1:value} in ${2:source}"';
+                        }
                     }
                 },
                 provideHover(document, position, token) {
@@ -324,7 +325,7 @@ function create(mode, tsPluginClient) {
                             if (!components) {
                                 components = [];
                                 tasks.push((async () => {
-                                    components = (await tsPluginClient?.getComponentNames(root.fileName) ?? [])
+                                    components = (await getComponentNames(root.fileName) ?? [])
                                         .filter(name => name !== 'Transition'
                                         && name !== 'TransitionGroup'
                                         && name !== 'KeepAlive'
@@ -373,10 +374,10 @@ function create(mode, tsPluginClient) {
                                 tagMap.set(tag, tagInfo);
                                 tasks.push((async () => {
                                     tagMap.set(tag, {
-                                        attrs: await tsPluginClient?.getElementAttrs(root.fileName, tag) ?? [],
-                                        propInfos: await tsPluginClient?.getComponentProps(root.fileName, tag) ?? [],
-                                        events: await tsPluginClient?.getComponentEvents(root.fileName, tag) ?? [],
-                                        directives: await tsPluginClient?.getComponentDirectives(root.fileName) ?? [],
+                                        attrs: await getElementAttrs(root.fileName, tag) ?? [],
+                                        propInfos: await getComponentProps(root.fileName, tag) ?? [],
+                                        events: await getComponentEvents(root.fileName, tag) ?? [],
+                                        directives: await getComponentDirectives(root.fileName) ?? [],
                                     });
                                     version++;
                                 })());
@@ -467,28 +468,25 @@ function create(mode, tsPluginClient) {
                                 ...attrs.map(attr => ({ name: attr })),
                             ]) {
                                 if (prop.name.startsWith('onUpdate:')) {
-                                    const isGlobal = !propNameSet.has(prop.name);
-                                    models.push([isGlobal, prop.name.slice('onUpdate:'.length)]);
+                                    models.push(prop.name.slice('onUpdate:'.length));
                                 }
                             }
                             for (const event of events) {
                                 if (event.startsWith('update:')) {
-                                    models.push([false, event.slice('update:'.length)]);
+                                    models.push(event.slice('update:'.length));
                                 }
                             }
-                            for (const [isGlobal, model] of models) {
+                            for (const model of models) {
                                 const name = casing.attr === nameCasing_1.AttrNameCasing.Camel ? model : (0, language_core_1.hyphenateAttr)(model);
                                 attributes.push({ name: 'v-model:' + name });
                                 propMap.set('v-model:' + name, {
                                     name,
                                     kind: 'prop',
-                                    isGlobal,
                                 });
                                 if (model === 'modelValue') {
                                     propMap.set('v-model', {
                                         name,
                                         kind: 'prop',
-                                        isGlobal,
                                     });
                                 }
                             }
@@ -499,7 +497,7 @@ function create(mode, tsPluginClient) {
                                 values = [];
                                 tasks.push((async () => {
                                     if (tag === 'slot' && attr === 'name') {
-                                        values = await tsPluginClient?.getComponentSlots(root.fileName) ?? [];
+                                        values = await getComponentSlots(root.fileName) ?? [];
                                     }
                                     version++;
                                 })());

package/lib/plugins/vue-twoslash-queries.d.ts

@@ -1,2 +1,2 @@
 import type { LanguageServicePlugin } from '@volar/language-service';
-export declare function create(tsPluginClient: import('@vue/typescript-plugin/lib/requests').Requests | undefined): LanguageServicePlugin;
+export declare function create({ getQuickInfoAtPosition }: import('@vue/typescript-plugin/lib/requests').Requests): LanguageServicePlugin;

package/lib/plugins/vue-twoslash-queries.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const twoslashTemplateReg = /<!--\s*\^\?\s*-->/g;
 const twoslashScriptReg = /(?<=^|\n)\s*\/\/\s*\^\?/g;
-function create(tsPluginClient) {
+function create({ getQuickInfoAtPosition }) {
     return {
         name: 'vue-twoslash-queries',
         capabilities: {
@@ -36,7 +36,7 @@ function create(tsPluginClient) {
                     for (const [pointerPosition, hoverOffset] of hoverOffsets) {
                         const map = context.language.maps.get(virtualCode, sourceScript);
                         for (const [sourceOffset] of map.toSourceLocation(hoverOffset)) {
-                            const quickInfo = await tsPluginClient?.getQuickInfoAtPosition(root.fileName, sourceDocument.positionAt(sourceOffset));
+                            const quickInfo = await getQuickInfoAtPosition(root.fileName, sourceDocument.positionAt(sourceOffset));
                             if (quickInfo) {
                                 inlayHints.push({
                                     position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/lib/{plugins/utils.d.ts → utils.d.ts}

@@ -1,7 +1,6 @@
 import { type LanguageServiceContext, type SourceScript, type TextDocument } from '@volar/language-service';
 import { VueVirtualCode } from '@vue/language-core';
 import { URI } from 'vscode-uri';
-export declare function sleep(ms: number): Promise<unknown>;
 export declare function getEmbeddedInfo(context: LanguageServiceContext, document: TextDocument, embeddedCodeId?: string | ((id: string) => boolean), languageId?: string): {
     sourceScript: Required<SourceScript<URI>>;
     virtualCode: import("@volar/language-service").VirtualCode;

package/lib/{plugins/utils.js → utils.js}

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = sleep;
 exports.getEmbeddedInfo = getEmbeddedInfo;
 const language_core_1 = require("@vue/language-core");
 const vscode_uri_1 = require("vscode-uri");
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
 function getEmbeddedInfo(context, document, embeddedCodeId, languageId) {
     const uri = vscode_uri_1.URI.parse(document.uri);
     const decoded = context.decodeEmbeddedDocumentUri(uri);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.0.4",
+	"version": "3.0.6",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -17,8 +17,8 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.20",
-		"@vue/language-core": "3.0.4",
+		"@volar/language-service": "2.4.23",
+		"@vue/language-core": "3.0.6",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.65",
@@ -34,11 +34,11 @@
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/kit": "2.4.20",
-		"@volar/typescript": "2.4.20",
+		"@volar/kit": "2.4.23",
+		"@volar/typescript": "2.4.23",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.0.4",
+		"@vue/typescript-plugin": "3.0.6",
 		"vscode-css-languageservice": "^6.3.1"
 	},
-	"gitHead": "148d386f9779c2de64cdcbd35310e03b36943b05"
+	"gitHead": "59f8cde8a5148e54294868104312b2b0f4c30d1e"
 }

package/lib/plugins/vue-autoinsert-dotvalue.d copy.d.ts

@@ -1,2 +0,0 @@
-import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
-export declare function create(ts: typeof import('typescript'), getTsPluginClient?: (context: LanguageServiceContext) => import('@vue/typescript-plugin/lib/requests').Requests | undefined): LanguageServicePlugin;

package/lib/plugins/vue-autoinsert-dotvalue.d copy.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=vue-autoinsert-dotvalue.d%20copy.js.map

package/lib/plugins/vue-complete-define-assignment.d.ts

@@ -1,2 +0,0 @@
-import type { LanguageServicePlugin } from '@volar/language-service';
-export declare function create(): LanguageServicePlugin;

package/lib/plugins/vue-complete-define-assignment.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = create;
-const language_core_1 = require("@vue/language-core");
-const vscode_uri_1 = require("vscode-uri");
-const utils_1 = require("./utils");
-function create() {
-    return {
-        name: 'vue-complete-define-assignment',
-        capabilities: {
-            completionProvider: {},
-        },
-        create(context) {
-            return {
-                isAdditionalCompletion: true,
-                async provideCompletionItems(document) {
-                    if (!(0, utils_1.isTsDocument)(document)) {
-                        return;
-                    }
-                    const enabled = await context.env.getConfiguration?.('vue.suggest.defineAssignment') ?? true;
-                    if (!enabled) {
-                        return;
-                    }
-                    const uri = vscode_uri_1.URI.parse(document.uri);
-                    const decoded = context.decodeEmbeddedDocumentUri(uri);
-                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
-                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!sourceScript?.generated || !virtualCode) {
-                        return;
-                    }
-                    const root = sourceScript.generated.root;
-                    if (!(root instanceof language_core_1.VueVirtualCode)) {
-                        return;
-                    }
-                    const { sfc } = root;
-                    const codegen = language_core_1.tsCodegen.get(sfc);
-                    const scriptSetup = sfc.scriptSetup;
-                    const scriptSetupRanges = codegen?.getScriptSetupRanges();
-                    if (!scriptSetup || !scriptSetupRanges) {
-                        return;
-                    }
-                    const result = [];
-                    const mappings = [...context.language.maps.forEach(virtualCode)];
-                    addDefineCompletionItem(scriptSetupRanges.defineProps?.statement, scriptSetupRanges.withDefaults?.exp ?? scriptSetupRanges.defineProps?.exp, 'props');
-                    addDefineCompletionItem(scriptSetupRanges.defineEmits?.statement, scriptSetupRanges.defineEmits?.exp, 'emit');
-                    addDefineCompletionItem(scriptSetupRanges.defineSlots?.statement, scriptSetupRanges.defineSlots?.exp, 'slots');
-                    return {
-                        isIncomplete: false,
-                        items: result,
-                    };
-                    function addDefineCompletionItem(statement, exp, name) {
-                        if (!exp || exp.start !== statement?.start) {
-                            return;
-                        }
-                        let offset;
-                        for (const [, map] of mappings) {
-                            for (const [generatedOffset] of map.toGeneratedLocation(scriptSetup.startTagEnd + exp.start)) {
-                                offset = generatedOffset;
-                                break;
-                            }
-                        }
-                        if (offset === undefined) {
-                            return;
-                        }
-                        const pos = document.positionAt(offset);
-                        result.push({
-                            label: name,
-                            kind: 6,
-                            commitCharacters: ['.', ',', ';'],
-                            additionalTextEdits: [{
-                                    newText: `const ${name} = `,
-                                    range: {
-                                        start: pos,
-                                        end: pos,
-                                    },
-                                }],
-                        });
-                    }
-                },
-            };
-        },
-    };
-}
-//# sourceMappingURL=vue-complete-define-assignment.js.map

package/lib/plugins/vue-destructured-props-hints.d.ts

@@ -1,7 +0,0 @@
-import type { LanguageServicePlugin } from '@volar/language-service';
-import type * as ts from 'typescript';
-export declare function create(ts: typeof import('typescript')): LanguageServicePlugin;
-/**
- * Refactored from https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/script/definePropsDestructure.ts
- */
-export declare function findDestructuredProps(ts: typeof import('typescript'), ast: ts.SourceFile, props: MapIterator<string>): [ts.Identifier, boolean][];

package/lib/plugins/vue-destructured-props-hints.js

@@ -1,220 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = create;
-exports.findDestructuredProps = findDestructuredProps;
-const language_core_1 = require("@vue/language-core");
-const vscode_uri_1 = require("vscode-uri");
-function create(ts) {
-    return {
-        name: 'vue-destructured-props-hints',
-        capabilities: {
-            inlayHintProvider: {},
-        },
-        create(context) {
-            return {
-                async provideInlayHints(document) {
-                    const enabled = await context.env.getConfiguration?.('vue.inlayHints.destructuredProps') ?? false;
-                    if (!enabled) {
-                        return;
-                    }
-                    const uri = vscode_uri_1.URI.parse(document.uri);
-                    const decoded = context.decodeEmbeddedDocumentUri(uri);
-                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
-                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!sourceScript?.generated || virtualCode?.id !== 'main') {
-                        return;
-                    }
-                    const root = sourceScript.generated.root;
-                    if (!(root instanceof language_core_1.VueVirtualCode)) {
-                        return;
-                    }
-                    const result = [];
-                    const codegen = language_core_1.tsCodegen.get(root.sfc);
-                    const scriptSetupRanges = codegen?.getScriptSetupRanges();
-                    if (!scriptSetupRanges?.defineProps?.destructured || !root.sfc.scriptSetup?.ast) {
-                        return;
-                    }
-                    for (const [prop, isShorthand] of findDestructuredProps(ts, root.sfc.scriptSetup.ast, scriptSetupRanges.defineProps.destructured.keys())) {
-                        const name = prop.text;
-                        const end = prop.getEnd();
-                        const pos = isShorthand ? end : end - name.length;
-                        const label = isShorthand ? `: props.${name}` : 'props.';
-                        result.push({
-                            label,
-                            position: document.positionAt(root.sfc.scriptSetup.startTagEnd + pos),
-                            kind: 2,
-                        });
-                    }
-                    return result;
-                },
-            };
-        },
-    };
-}
-/**
- * Refactored from https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/script/definePropsDestructure.ts
- */
-function findDestructuredProps(ts, ast, props) {
-    const rootScope = Object.create(null);
-    const scopeStack = [rootScope];
-    let currentScope = rootScope;
-    const excludedIds = new WeakSet();
-    const parentStack = [];
-    for (const prop of props) {
-        rootScope[prop] = true;
-    }
-    function pushScope() {
-        scopeStack.push(currentScope = Object.create(currentScope));
-    }
-    function popScope() {
-        scopeStack.pop();
-        currentScope = scopeStack[scopeStack.length - 1] || null;
-    }
-    function registerLocalBinding(id) {
-        excludedIds.add(id);
-        if (currentScope) {
-            currentScope[id.text] = false;
-        }
-    }
-    const references = [];
-    walkScope(ast, true);
-    walk(ast);
-    return references;
-    function walkScope(node, isRoot = false) {
-        ts.forEachChild(node, stmt => {
-            if (ts.isVariableStatement(stmt)) {
-                for (const decl of stmt.declarationList.declarations) {
-                    walkVariableDeclaration(decl, isRoot);
-                }
-            }
-            else if (ts.isFunctionDeclaration(stmt)
-                || ts.isClassDeclaration(stmt)) {
-                const declare = ts.getModifiers(stmt)?.find(modifier => modifier.kind === ts.SyntaxKind.DeclareKeyword);
-                if (!stmt.name || declare) {
-                    return;
-                }
-                registerLocalBinding(stmt.name);
-            }
-            else if ((ts.isForOfStatement(stmt) || ts.isForInStatement(stmt))
-                && ts.isVariableDeclarationList(stmt.initializer)) {
-                walkVariableDeclaration(stmt.initializer.declarations[0], isRoot);
-            }
-            else if (ts.isLabeledStatement(stmt)
-                && ts.isVariableDeclaration(stmt.statement)) {
-                walkVariableDeclaration(stmt.statement, isRoot);
-            }
-        });
-    }
-    function walkVariableDeclaration(decl, isRoot = false) {
-        const { initializer, name } = decl;
-        const isDefineProps = isRoot
-            && initializer
-            && ts.isCallExpression(initializer)
-            && initializer.expression.getText(ast) === 'defineProps';
-        for (const { id } of (0, language_core_1.collectIdentifiers)(ts, name)) {
-            if (isDefineProps) {
-                excludedIds.add(id);
-            }
-            else {
-                registerLocalBinding(id);
-            }
-        }
-    }
-    function walkFunctionDeclaration(node) {
-        const { name, parameters } = node;
-        if (name && ts.isIdentifier(name)) {
-            registerLocalBinding(name);
-        }
-        for (const p of parameters) {
-            for (const { id } of (0, language_core_1.collectIdentifiers)(ts, p)) {
-                registerLocalBinding(id);
-            }
-        }
-    }
-    function walk(parent) {
-        ts.forEachChild(parent, node => {
-            if (enter(node) ?? true) {
-                walk(node);
-                leave(node);
-            }
-        });
-        function enter(node) {
-            if (parent) {
-                parentStack.push(parent);
-            }
-            if (ts.isTypeLiteralNode(node)
-                || ts.isTypeReferenceNode(node)) {
-                return false;
-            }
-            if (ts.isFunctionLike(node)) {
-                pushScope();
-                walkFunctionDeclaration(node);
-                if ('body' in node) {
-                    walkScope(node.body);
-                }
-                return;
-            }
-            if (ts.isCatchClause(node)) {
-                pushScope();
-                const { variableDeclaration: p } = node;
-                if (p && ts.isIdentifier(p.name)) {
-                    registerLocalBinding(p.name);
-                }
-                walkScope(node.block);
-                return;
-            }
-            if (ts.isBlock(node)
-                && !ts.isFunctionLike(parent)
-                && !ts.isCatchClause(parent)) {
-                pushScope();
-                walkScope(node);
-                return;
-            }
-            if (ts.isIdentifier(node)
-                && isReferencedIdentifier(node, parent)
-                && !excludedIds.has(node)) {
-                const name = node.text;
-                if (currentScope[name]) {
-                    const isShorthand = ts.isShorthandPropertyAssignment(parent);
-                    references.push([node, isShorthand]);
-                }
-            }
-        }
-        function leave(node) {
-            if (parent) {
-                parentStack.pop();
-            }
-            if (ts.isFunctionLike(node)
-                || ts.isCatchClause(node)
-                || (ts.isBlock(node)
-                    && !ts.isFunctionLike(parent)
-                    && !ts.isCatchClause(parent))) {
-                popScope();
-            }
-        }
-    }
-    // TODO: more conditions
-    function isReferencedIdentifier(id, parent) {
-        if (!parent) {
-            return false;
-        }
-        if (id.text === 'arguments') {
-            return false;
-        }
-        if (ts.isExpressionWithTypeArguments(parent)
-            || ts.isInterfaceDeclaration(parent)
-            || ts.isTypeAliasDeclaration(parent)
-            || ts.isPropertySignature(parent)) {
-            return false;
-        }
-        if (ts.isPropertyAccessExpression(parent)
-            || ts.isPropertyAssignment(parent)
-            || ts.isPropertyDeclaration(parent)) {
-            if (parent.name === id) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-//# sourceMappingURL=vue-destructured-props-hints.js.map

package/lib/plugins/vue-diagnostic-global-types.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/plugins/vue-diagnostic-global-types.js

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

package/lib/plugins/vue-document-links.d.ts

@@ -1,2 +0,0 @@
-import type { LanguageServicePlugin } from '@volar/language-service';
-export declare function create(): LanguageServicePlugin;