@vue/language-service 2.0.2 → 2.0.3

package/index.d.ts

@@ -4,4 +4,4 @@ export * from './lib/ideFeatures/nameCasing';
 export * from './lib/types';
 import type { ServiceEnvironment, ServicePlugin } from '@volar/language-service';
 import type { VueCompilerOptions } from './lib/types';
-export declare function createVueServicePlugins(ts: typeof import('typescript'), getVueOptions: (env: ServiceEnvironment) => VueCompilerOptions): ServicePlugin[];
+export declare function createVueServicePlugins(ts: typeof import('typescript'), getVueOptions: (env: ServiceEnvironment) => VueCompilerOptions, tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): ServicePlugin[];

package/index.js

@@ -37,25 +37,25 @@ const vue_template_1 = require("./lib/plugins/vue-template");
 const vue_toggle_v_bind_codeaction_1 = require("./lib/plugins/vue-toggle-v-bind-codeaction");
 const vue_twoslash_queries_1 = require("./lib/plugins/vue-twoslash-queries");
 const vue_visualize_hidden_callback_param_1 = require("./lib/plugins/vue-visualize-hidden-callback-param");
-function createVueServicePlugins(ts, getVueOptions) {
+function createVueServicePlugins(ts, getVueOptions, tsPluginClient) {
     return [
         (0, volar_service_typescript_1.create)(ts),
         (0, volar_service_typescript_twoslash_queries_1.create)(),
         (0, css_1.create)(),
         (0, volar_service_pug_beautify_1.create)(),
         (0, volar_service_json_1.create)(),
-        (0, vue_template_1.create)('html', ts, getVueOptions),
-        (0, vue_template_1.create)('pug', ts, getVueOptions),
+        (0, vue_template_1.create)('html', ts, getVueOptions, tsPluginClient),
+        (0, vue_template_1.create)('pug', ts, getVueOptions, tsPluginClient),
         (0, vue_sfc_1.create)(),
-        (0, vue_twoslash_queries_1.create)(ts),
+        (0, vue_twoslash_queries_1.create)(ts, tsPluginClient),
         (0, vue_codelens_references_1.create)(),
         (0, vue_document_drop_1.create)(ts),
-        (0, vue_autoinsert_dotvalue_1.create)(ts),
+        (0, vue_autoinsert_dotvalue_1.create)(ts, tsPluginClient),
         (0, vue_autoinsert_parentheses_1.create)(ts),
         (0, vue_autoinsert_space_1.create)(),
         (0, vue_visualize_hidden_callback_param_1.create)(),
         (0, vue_directive_comments_1.create)(),
-        (0, vue_extract_file_1.create)(ts),
+        (0, vue_extract_file_1.create)(ts, tsPluginClient),
         (0, vue_toggle_v_bind_codeaction_1.create)(ts),
         (0, volar_service_emmet_1.create)(),
     ];

package/lib/ideFeatures/nameCasing.d.ts

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

package/lib/ideFeatures/nameCasing.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.detect = exports.getNameCasing = exports.convertAttrName = exports.convertTagName = void 0;
 const vue = require("@vue/language-core");
 const language_core_1 = require("@vue/language-core");
-const namedPipeClient = require("@vue/typescript-plugin/lib/client");
 const computeds_1 = require("computeds");
 const types_1 = require("../types");
-async function convertTagName(context, uri, casing) {
+async function convertTagName(context, uri, casing, tsPluginClient) {
     const sourceFile = context.language.files.get(uri);
     if (!sourceFile)
         return;
@@ -19,7 +18,7 @@ async function convertTagName(context, uri, casing) {
     const template = desc.template;
     const document = context.documents.get(sourceFile.id, sourceFile.languageId, sourceFile.snapshot);
     const edits = [];
-    const components = await namedPipeClient.getComponentNames(rootCode.fileName) ?? [];
+    const components = await tsPluginClient.getComponentNames(rootCode.fileName) ?? [];
     const tags = getTemplateTagsAndAttrs(rootCode);
     for (const [tagName, { offsets }] of tags) {
         const componentName = components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
@@ -40,7 +39,7 @@ async function convertTagName(context, uri, casing) {
     return edits;
 }
 exports.convertTagName = convertTagName;
-async function convertAttrName(context, uri, casing) {
+async function convertAttrName(context, uri, casing, tsPluginClient) {
     const sourceFile = context.language.files.get(uri);
     if (!sourceFile)
         return;
@@ -53,12 +52,12 @@ async function convertAttrName(context, uri, casing) {
     const template = desc.template;
     const document = context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
     const edits = [];
-    const components = await namedPipeClient.getComponentNames(rootCode.fileName) ?? [];
+    const components = await tsPluginClient.getComponentNames(rootCode.fileName) ?? [];
     const tags = getTemplateTagsAndAttrs(rootCode);
     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 namedPipeClient.getComponentProps(rootCode.fileName, componentName) ?? [];
+            const props = await tsPluginClient.getComponentProps(rootCode.fileName, componentName) ?? [];
             for (const [attrName, { offsets }] of attrs) {
                 const propName = props.find(prop => prop === attrName || (0, language_core_1.hyphenateAttr)(prop) === attrName);
                 if (propName) {
@@ -80,8 +79,8 @@ async function convertAttrName(context, uri, casing) {
     return edits;
 }
 exports.convertAttrName = convertAttrName;
-async function getNameCasing(context, uri) {
-    const detected = await detect(context, uri);
+async function getNameCasing(context, uri, tsPluginClient) {
+    const detected = await detect(context, uri, tsPluginClient);
     const [attr, tag] = await Promise.all([
         context.env.getConfiguration?.('vue.complete.casing.props', uri),
         context.env.getConfiguration?.('vue.complete.casing.tags', uri),
@@ -94,7 +93,7 @@ async function getNameCasing(context, uri) {
     };
 }
 exports.getNameCasing = getNameCasing;
-async function detect(context, uri) {
+async function detect(context, uri, tsPluginClient) {
     const rootFile = context.language.files.get(uri)?.generated?.code;
     if (!(rootFile instanceof language_core_1.VueGeneratedCode)) {
         return {
@@ -128,7 +127,7 @@ async function detect(context, uri) {
         return result;
     }
     async function getTagNameCase(file) {
-        const components = await namedPipeClient.getComponentNames(file.fileName) ?? [];
+        const components = await tsPluginClient?.getComponentNames(file.fileName) ?? [];
         const tagNames = getTemplateTagsAndAttrs(file);
         const result = [];
         let anyComponentUsed = false;

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

@@ -2,7 +2,7 @@ import type { ServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type * as vscode from 'vscode-languageserver-protocol';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function create(ts: typeof import('typescript')): ServicePlugin;
+export declare function create(ts: typeof import('typescript'), tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): ServicePlugin;
 export declare function isCharacterTyping(document: TextDocument, lastChange: {
     range: vscode.Range;
     text: string;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBlacklistNode = exports.isCharacterTyping = exports.create = void 0;
 const language_core_1 = require("@vue/language-core");
-const namedPipeClient = require("@vue/typescript-plugin/lib/client");
 const asts = new WeakMap();
 function getAst(ts, fileName, snapshot, scriptKind) {
     let ast = asts.get(snapshot);
@@ -12,7 +11,7 @@ function getAst(ts, fileName, snapshot, scriptKind) {
     }
     return ast;
 }
-function create(ts) {
+function create(ts, tsPluginClient) {
     return {
         name: 'vue-autoinsert-dotvalue',
         create(context) {
@@ -61,7 +60,7 @@ function create(ts) {
                     }
                     if (isBlacklistNode(ts, ast, document.offsetAt(position), false))
                         return;
-                    const props = await namedPipeClient.getPropertiesAtLocation(fileName, sourceCodeOffset) ?? [];
+                    const props = await tsPluginClient?.getPropertiesAtLocation(fileName, sourceCodeOffset) ?? [];
                     if (props.some(prop => prop === 'value')) {
                         return '${1:.value}';
                     }

package/lib/plugins/vue-extract-file.d.ts

@@ -1,6 +1,6 @@
 import type { ServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
-export declare function create(ts: typeof import('typescript')): ServicePlugin;
+export declare function create(ts: typeof import('typescript'), tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): ServicePlugin;
 export declare function getLastImportNode(ts: typeof import('typescript'), sourceFile: ts.SourceFile): ts.Node | undefined;
 export declare function createAddComponentToOptionEdit(ts: typeof import('typescript'), ast: ts.SourceFile, componentName: string): {
     range: import("@vue/language-core").TextRange;

package/lib/plugins/vue-extract-file.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAddComponentToOptionEdit = exports.getLastImportNode = exports.create = void 0;
 const language_core_1 = require("@vue/language-core");
-const client_1 = require("@vue/typescript-plugin/lib/client");
 const unicodeReg = /\\u/g;
-function create(ts) {
+function create(ts, tsPluginClient) {
     return {
         name: 'vue-extract-file',
         create(context) {
@@ -52,7 +51,7 @@ function create(ts) {
                     const templateCodeRange = selectTemplateCode(startOffset, endOffset, sfc.template);
                     if (!templateCodeRange)
                         return codeAction;
-                    const toExtract = await (0, client_1.collectExtractProps)(sourceFile.generated.code.fileName, templateCodeRange) ?? [];
+                    const toExtract = await tsPluginClient?.collectExtractProps(sourceFile.generated.code.fileName, templateCodeRange) ?? [];
                     if (!toExtract)
                         return codeAction;
                     const templateInitialIndent = await context.env.getConfiguration('vue.format.template.initialIndent') ?? true;

package/lib/plugins/vue-template.d.ts

@@ -1,3 +1,3 @@
 import type { ServiceEnvironment } from '@volar/language-service';
 import { ServicePlugin, VueCompilerOptions } from '../types';
-export declare function create(mode: 'html' | 'pug', ts: typeof import('typescript'), getVueOptions: (env: ServiceEnvironment) => VueCompilerOptions): ServicePlugin;
+export declare function create(mode: 'html' | 'pug', ts: typeof import('typescript'), getVueOptions: (env: ServiceEnvironment) => VueCompilerOptions, tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): ServicePlugin;

package/lib/plugins/vue-template.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
-const namedPipeClient = require("@vue/typescript-plugin/lib/client");
 const volar_service_html_1 = require("volar-service-html");
 const volar_service_pug_1 = require("volar-service-pug");
 const html = require("vscode-html-languageservice");
@@ -12,7 +11,7 @@ const types_1 = require("../types");
 const data_1 = require("./data");
 let builtInData;
 let modelData;
-function create(mode, ts, getVueOptions) {
+function create(mode, ts, getVueOptions, tsPluginClient) {
     let customData = [];
     const onDidChangeCustomDataListeners = new Set();
     const onDidChangeCustomData = (listener) => {
@@ -107,8 +106,8 @@ function create(mode, ts, getVueOptions) {
                         const scanner = getScanner(baseServiceInstance, document);
                         if (code instanceof language_core_1.VueGeneratedCode && scanner) {
                             // visualize missing required props
-                            const casing = await (0, nameCasing_1.getNameCasing)(context, map.sourceDocument.uri);
-                            const components = await namedPipeClient.getComponentNames(code.fileName) ?? [];
+                            const casing = await (0, nameCasing_1.getNameCasing)(context, map.sourceDocument.uri, tsPluginClient);
+                            const components = await tsPluginClient?.getComponentNames(code.fileName) ?? [];
                             const componentProps = {};
                             let token;
                             let current;
@@ -120,7 +119,7 @@ function create(mode, ts, getVueOptions) {
                                         : components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
                                     const checkTag = tagName.indexOf('.') >= 0 ? tagName : component;
                                     if (checkTag) {
-                                        componentProps[checkTag] ??= await namedPipeClient.getComponentProps(code.fileName, checkTag, true) ?? [];
+                                        componentProps[checkTag] ??= await tsPluginClient?.getComponentProps(code.fileName, checkTag, true) ?? [];
                                         current = {
                                             unburnedRequiredProps: [...componentProps[checkTag]],
                                             labelOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
@@ -245,7 +244,7 @@ function create(mode, ts, getVueOptions) {
                 },
             };
             async function provideHtmlData(sourceDocumentUri, vueCode) {
-                const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri);
+                const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri, tsPluginClient);
                 if (builtInData.tags) {
                     for (const tag of builtInData.tags) {
                         if (tag.name === 'slot')
@@ -275,7 +274,7 @@ function create(mode, ts, getVueOptions) {
                         provideTags: () => {
                             if (!components) {
                                 promises.push((async () => {
-                                    components = (await namedPipeClient.getComponentNames(vueCode.fileName) ?? [])
+                                    components = (await tsPluginClient?.getComponentNames(vueCode.fileName) ?? [])
                                         .filter(name => name !== 'Transition'
                                         && name !== 'TransitionGroup'
                                         && name !== 'KeepAlive'
@@ -314,14 +313,14 @@ function create(mode, ts, getVueOptions) {
                             return tags;
                         },
                         provideAttributes: (tag) => {
-                            namedPipeClient.getTemplateContextProps;
+                            tsPluginClient?.getTemplateContextProps;
                             let failed = false;
                             let tagInfo = tagInfos.get(tag);
                             if (!tagInfo) {
                                 promises.push((async () => {
-                                    const attrs = await namedPipeClient.getElementAttrs(vueCode.fileName, tag) ?? [];
-                                    const props = await namedPipeClient.getComponentProps(vueCode.fileName, tag) ?? [];
-                                    const events = await namedPipeClient.getComponentEvents(vueCode.fileName, tag) ?? [];
+                                    const attrs = await tsPluginClient?.getElementAttrs(vueCode.fileName, tag) ?? [];
+                                    const props = await tsPluginClient?.getComponentProps(vueCode.fileName, tag) ?? [];
+                                    const events = await tsPluginClient?.getComponentEvents(vueCode.fileName, tag) ?? [];
                                     tagInfos.set(tag, {
                                         attrs,
                                         props,
@@ -340,7 +339,7 @@ function create(mode, ts, getVueOptions) {
                             if (_tsCodegen) {
                                 if (!templateContextProps) {
                                     promises.push((async () => {
-                                        templateContextProps = await namedPipeClient.getTemplateContextProps(vueCode.fileName) ?? [];
+                                        templateContextProps = await tsPluginClient?.getTemplateContextProps(vueCode.fileName) ?? [];
                                         version++;
                                     })());
                                     return [];
@@ -442,7 +441,7 @@ function create(mode, ts, getVueOptions) {
             }
             async function afterHtmlCompletion(completionList, sourceDocument, code) {
                 const replacement = getReplacement(completionList, sourceDocument);
-                const componentNames = new Set((await namedPipeClient.getComponentNames(code.fileName) ?? [])
+                const componentNames = new Set((await tsPluginClient?.getComponentNames(code.fileName) ?? [])
                     .map(language_core_1.hyphenateTag));
                 if (replacement) {
                     const isEvent = replacement.text.startsWith('v-on:') || replacement.text.startsWith('@');

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

@@ -1,2 +1,2 @@
 import type { ServicePlugin } from '@volar/language-service';
-export declare function create(ts: typeof import('typescript')): ServicePlugin;
+export declare function create(ts: typeof import('typescript'), tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): ServicePlugin;

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const vue = require("@vue/language-core");
-const client_1 = require("@vue/typescript-plugin/lib/client");
 const twoslashReg = /<!--\s*\^\?\s*-->/g;
-function create(ts) {
+function create(ts, tsPluginClient) {
     return {
         name: 'vue-twoslash-queries',
         create(context) {
@@ -26,7 +25,7 @@ function create(ts) {
                     for (const [pointerPosition, hoverOffset] of hoverOffsets) {
                         for (const [_1, [_2, map]] of context.language.files.getMaps(virtualCode)) {
                             for (const [sourceOffset] of map.getSourceOffsets(hoverOffset)) {
-                                const quickInfo = await (0, client_1.getQuickInfoAtPosition)(sourceFile.generated.code.fileName, sourceOffset);
+                                const quickInfo = await tsPluginClient?.getQuickInfoAtPosition(sourceFile.generated.code.fileName, sourceOffset);
                                 if (quickInfo) {
                                     inlayHints.push({
                                         position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -20,9 +20,8 @@
 		"@volar/language-service": "~2.1.0",
 		"@volar/typescript": "~2.1.0",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.2",
+		"@vue/language-core": "2.0.3",
 		"@vue/shared": "^3.4.0",
-		"@vue/typescript-plugin": "2.0.2",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.31",
@@ -40,8 +39,9 @@
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
 		"@volar/kit": "~2.1.0",
+		"@vue/typescript-plugin": "2.0.3",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "b377d5f990ffe7ef44f0d1871fcb8b5c2deafad1"
+	"gitHead": "fc1e288c8c0c82e6730781006d84a2676b5266ff"
 }