@vue/language-service 2.0.22 → 2.0.23-alpha.1

package/index.d.ts

@@ -2,7 +2,14 @@ export * from '@volar/language-service';
 export * from '@vue/language-core';
 export * from './lib/ideFeatures/nameCasing';
 export * from './lib/types';
-import type { LanguageServicePlugin, LanguageServiceContext, LanguageServiceEnvironment } from '@volar/language-service';
-import type { VueCompilerOptions } from './lib/types';
-export declare function getVueLanguageServicePlugins(ts: typeof import('typescript'), getVueOptions: (env: LanguageServiceEnvironment) => VueCompilerOptions, getTsPluginClient?: (context: LanguageServiceContext) => typeof import("@vue/typescript-plugin/lib/client") | undefined, hybridMode?: boolean): LanguageServicePlugin[];
-export declare function createDefaultGetTsPluginClient(ts: typeof import('typescript')): (context: LanguageServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined;
+import type { LanguageServicePlugin } from '@volar/language-service';
+export declare function getFullLanguageServicePlugins(ts: typeof import('typescript')): LanguageServicePlugin[];
+export declare function getHybridModeLanguageServicePlugins(ts: typeof import('typescript'), getTsPluginClient: typeof import("@vue/typescript-plugin/lib/client")): LanguageServicePlugin[];
+export declare const commands: {
+    parseSfc: string;
+    detectNameCasing: string;
+    convertTagsToKebabCase: string;
+    convertTagsToPascalCase: string;
+    convertPropsToKebabCase: string;
+    convertPropsToCamelCase: string;
+};

package/index.js

@@ -14,12 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVueLanguageServicePlugins = getVueLanguageServicePlugins;
-exports.createDefaultGetTsPluginClient = createDefaultGetTsPluginClient;
+exports.commands = void 0;
+exports.getFullLanguageServicePlugins = getFullLanguageServicePlugins;
+exports.getHybridModeLanguageServicePlugins = getHybridModeLanguageServicePlugins;
 __exportStar(require("@volar/language-service"), exports);
 __exportStar(require("@vue/language-core"), exports);
 __exportStar(require("./lib/ideFeatures/nameCasing"), exports);
 __exportStar(require("./lib/types"), exports);
+const types_1 = require("./lib/types");
 const volar_service_emmet_1 = require("volar-service-emmet");
 const volar_service_json_1 = require("volar-service-json");
 const volar_service_pug_beautify_1 = require("volar-service-pug-beautify");
@@ -39,6 +41,7 @@ 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");
+const language_core_1 = require("@vue/language-core");
 const common_1 = require("@vue/typescript-plugin/lib/common");
 const collectExtractProps_1 = require("@vue/typescript-plugin/lib/requests/collectExtractProps");
 const componentInfos_1 = require("@vue/typescript-plugin/lib/requests/componentInfos");
@@ -46,43 +49,34 @@ const getImportPathForFile_1 = require("@vue/typescript-plugin/lib/requests/getI
 const getPropertiesAtLocation_1 = require("@vue/typescript-plugin/lib/requests/getPropertiesAtLocation");
 const getQuickInfoAtPosition_1 = require("@vue/typescript-plugin/lib/requests/getQuickInfoAtPosition");
 const vscode_uri_1 = require("vscode-uri");
-function getVueLanguageServicePlugins(ts, getVueOptions, getTsPluginClient = createDefaultGetTsPluginClient(ts), hybridMode = false) {
-    const plugins = [];
-    if (!hybridMode) {
-        plugins.push(...(0, volar_service_typescript_1.create)(ts));
-        for (let i = 0; i < plugins.length; i++) {
-            const plugin = plugins[i];
-            if (plugin.name === 'typescript-semantic') {
-                plugins[i] = {
-                    ...plugin,
-                    create(context) {
-                        const created = plugin.create(context);
-                        if (!context.language.typescript) {
-                            return created;
-                        }
-                        const languageService = created.provide['typescript/languageService']();
-                        const vueOptions = getVueOptions(context.env);
-                        (0, common_1.decorateLanguageServiceForVue)(context.language, languageService, vueOptions, ts, false, fileName => context.language.typescript?.asScriptId(fileName) ?? vscode_uri_1.URI.file(fileName));
+const nameCasing_1 = require("./lib/ideFeatures/nameCasing");
+function getFullLanguageServicePlugins(ts) {
+    const plugins = [
+        ...(0, volar_service_typescript_1.create)(ts),
+        ...getCommonLanguageServicePlugins(ts, getTsPluginClientForLSP)
+    ];
+    for (let i = 0; i < plugins.length; i++) {
+        const plugin = plugins[i];
+        if (plugin.name === 'typescript-semantic') {
+            plugins[i] = {
+                ...plugin,
+                create(context) {
+                    const created = plugin.create(context);
+                    if (!context.language.typescript) {
                         return created;
-                    },
-                };
-                break;
-            }
+                    }
+                    const languageService = created.provide['typescript/languageService']();
+                    if (context.language.vue) {
+                        (0, common_1.decorateLanguageServiceForVue)(context.language, languageService, context.language.vue.compilerOptions, ts, false, context.language.typescript.asScriptId);
+                    }
+                    return created;
+                },
+            };
+            break;
         }
     }
-    else {
-        plugins.push((0, syntactic_1.create)(ts), (0, docCommentTemplate_1.create)(ts));
-    }
-    plugins.push((0, volar_service_typescript_twoslash_queries_1.create)(ts), (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, getTsPluginClient), (0, vue_template_1.create)('pug', ts, getVueOptions, getTsPluginClient), (0, vue_sfc_1.create)(), (0, vue_twoslash_queries_1.create)(ts, getTsPluginClient), (0, vue_document_links_1.create)(), (0, vue_document_drop_1.create)(ts, getVueOptions, getTsPluginClient), (0, vue_autoinsert_dotvalue_1.create)(ts, getTsPluginClient), (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, getTsPluginClient), (0, vue_toggle_v_bind_codeaction_1.create)(ts), (0, volar_service_emmet_1.create)({
-        mappedLanguages: {
-            'vue': 'html',
-            'postcss': 'scss',
-        },
-    }));
     return plugins;
-}
-function createDefaultGetTsPluginClient(ts) {
-    return context => {
+    function getTsPluginClientForLSP(context) {
         if (!context.language.typescript) {
             return;
         }
@@ -127,6 +121,102 @@ function createDefaultGetTsPluginClient(ts) {
                 return await getQuickInfoAtPosition_1.getQuickInfoAtPosition.apply(requestContext, args);
             },
         };
-    };
+    }
+}
+function getHybridModeLanguageServicePlugins(ts, getTsPluginClient) {
+    const plugins = [
+        (0, syntactic_1.create)(ts),
+        (0, docCommentTemplate_1.create)(ts),
+        ...getCommonLanguageServicePlugins(ts, () => getTsPluginClient)
+    ];
+    for (const plugin of plugins) {
+        // avoid affecting TS plugin
+        delete plugin.capabilities.semanticTokensProvider;
+    }
+    return plugins;
+}
+exports.commands = {
+    parseSfc: 'vue.parseSfc',
+    detectNameCasing: 'vue.detectNameCasing',
+    convertTagsToKebabCase: 'vue.convertTagsToKebabCase',
+    convertTagsToPascalCase: 'vue.convertTagsToPascalCase',
+    convertPropsToKebabCase: 'vue.convertPropsToKebabCase',
+    convertPropsToCamelCase: 'vue.convertPropsToCamelCase',
+};
+function getCommonLanguageServicePlugins(ts, getTsPluginClient) {
+    return [
+        (0, volar_service_typescript_twoslash_queries_1.create)(ts),
+        (0, css_1.create)(),
+        (0, volar_service_pug_beautify_1.create)(),
+        (0, volar_service_json_1.create)(),
+        (0, vue_template_1.create)('html', ts, getTsPluginClient),
+        (0, vue_template_1.create)('pug', ts, getTsPluginClient),
+        (0, vue_sfc_1.create)(),
+        (0, vue_twoslash_queries_1.create)(ts, getTsPluginClient),
+        (0, vue_document_links_1.create)(),
+        (0, vue_document_drop_1.create)(ts, getTsPluginClient),
+        (0, vue_autoinsert_dotvalue_1.create)(ts, getTsPluginClient),
+        (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, getTsPluginClient),
+        (0, vue_toggle_v_bind_codeaction_1.create)(ts),
+        (0, volar_service_emmet_1.create)({
+            mappedLanguages: {
+                'vue': 'html',
+                'postcss': 'scss',
+            },
+        }),
+        {
+            name: 'vue-parse-sfc',
+            capabilities: {
+                executeCommandProvider: {
+                    commands: [exports.commands.parseSfc],
+                },
+            },
+            create() {
+                return {
+                    executeCommand(_command, [source]) {
+                        return (0, language_core_1.parse)(source);
+                    },
+                };
+            },
+        },
+        {
+            name: 'vue-name-casing',
+            capabilities: {
+                executeCommandProvider: {
+                    commands: [
+                        exports.commands.detectNameCasing,
+                        exports.commands.convertTagsToKebabCase,
+                        exports.commands.convertTagsToPascalCase,
+                        exports.commands.convertPropsToKebabCase,
+                        exports.commands.convertPropsToCamelCase,
+                    ],
+                }
+            },
+            create(context) {
+                return {
+                    executeCommand(command, [uri]) {
+                        if (command === exports.commands.detectNameCasing) {
+                            return (0, nameCasing_1.detect)(context, vscode_uri_1.URI.parse(uri));
+                        }
+                        else if (command === exports.commands.convertTagsToKebabCase) {
+                            return (0, nameCasing_1.convertTagName)(context, vscode_uri_1.URI.parse(uri), types_1.TagNameCasing.Kebab, getTsPluginClient(context));
+                        }
+                        else if (command === exports.commands.convertTagsToPascalCase) {
+                            return (0, nameCasing_1.convertTagName)(context, vscode_uri_1.URI.parse(uri), types_1.TagNameCasing.Pascal, getTsPluginClient(context));
+                        }
+                        else if (command === exports.commands.convertPropsToKebabCase) {
+                            return (0, nameCasing_1.convertAttrName)(context, vscode_uri_1.URI.parse(uri), types_1.AttrNameCasing.Kebab, getTsPluginClient(context));
+                        }
+                        else if (command === exports.commands.convertPropsToCamelCase) {
+                            return (0, nameCasing_1.convertAttrName)(context, vscode_uri_1.URI.parse(uri), types_1.AttrNameCasing.Camel, getTsPluginClient(context));
+                        }
+                    },
+                };
+            },
+        }
+    ];
 }
 //# sourceMappingURL=index.js.map

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

@@ -1,3 +1,2 @@
-import { VueCompilerOptions } from '@vue/language-core';
-import { LanguageServiceContext, LanguageServiceEnvironment, LanguageServicePlugin } from '../types';
-export declare function create(ts: typeof import('typescript'), getVueOptions: (env: LanguageServiceEnvironment) => VueCompilerOptions, getTsPluginClient?: (context: LanguageServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined): LanguageServicePlugin;
+import { LanguageServiceContext, LanguageServicePlugin } from '../types';
+export declare function create(ts: typeof import('typescript'), getTsPluginClient?: (context: LanguageServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined): LanguageServicePlugin;

package/lib/plugins/vue-document-drop.js

@@ -8,16 +8,19 @@ const getUserPreferences_1 = require("volar-service-typescript/lib/configs/getUs
 const vscode_uri_1 = require("vscode-uri");
 const vue_extract_file_1 = require("../plugins/vue-extract-file");
 const types_1 = require("../types");
-function create(ts, getVueOptions, getTsPluginClient) {
+function create(ts, getTsPluginClient) {
     return {
         name: 'vue-document-drop',
         capabilities: {
         // documentDropEditsProvider: true,
         },
         create(context) {
+            if (!context.language.vue) {
+                return {};
+            }
             let casing = types_1.TagNameCasing.Pascal; // TODO
             const tsPluginClient = getTsPluginClient?.(context);
-            const vueCompilerOptions = getVueOptions(context.env);
+            const vueCompilerOptions = context.language.vue.compilerOptions;
             return {
                 async provideDocumentDropEdits(document, _position, dataTransfer) {
                     if (document.languageId !== 'html') {
@@ -48,7 +51,7 @@ function create(ts, getVueOptions, getTsPluginClient) {
                         return;
                     }
                     const additionalEdit = {};
-                    const code = [...(0, language_core_1.forEachEmbeddedCode)(vueVirtualCode)].find(code => code.id === (sfc.scriptSetup ? 'scriptSetupFormat' : 'scriptFormat'));
+                    const code = [...(0, language_core_1.forEachEmbeddedCode)(vueVirtualCode)].find(code => code.id === (sfc.scriptSetup ? 'scriptsetup_raw' : 'script_raw'));
                     const lastImportNode = (0, vue_extract_file_1.getLastImportNode)(ts, script.ast);
                     const incomingFileName = context.language.typescript?.asFileName(vscode_uri_1.URI.parse(importUri))
                         ?? vscode_uri_1.URI.parse(importUri).fsPath.replace(/\\/g, '/');

package/lib/plugins/vue-sfc.js

@@ -52,7 +52,7 @@ function create() {
                 provideDocumentLinks: undefined,
                 async resolveEmbeddedCodeFormattingOptions(sourceScript, virtualCode, options) {
                     if (sourceScript.generated?.root instanceof vue.VueVirtualCode) {
-                        if (virtualCode.id === 'scriptFormat' || virtualCode.id === 'scriptSetupFormat') {
+                        if (virtualCode.id === 'script_raw' || virtualCode.id === 'scriptsetup_raw') {
                             if (await context.env.getConfiguration?.('vue.format.script.initialIndent') ?? false) {
                                 options.initialIndentLevel++;
                             }

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

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

package/lib/plugins/vue-template.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
 const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
+const common_1 = require("@vue/typescript-plugin/lib/common");
 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 nameCasing_1 = require("../ideFeatures/nameCasing");
 const types_1 = require("../types");
 const data_1 = require("./data");
-const vscode_uri_1 = require("vscode-uri");
-const common_1 = require("@vue/typescript-plugin/lib/common");
 let builtInData;
 let modelData;
-function create(mode, ts, getVueOptions, getTsPluginClient) {
+function create(mode, ts, getTsPluginClient) {
     let customData = [];
     let extraCustomData = [];
     let lastCompletionComponentNames = new Set();
@@ -69,7 +69,6 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
         create(context) {
             const tsPluginClient = getTsPluginClient?.(context);
             const baseServiceInstance = baseService.create(context);
-            const vueCompilerOptions = getVueOptions(context.env);
             builtInData ??= (0, data_1.loadTemplateData)(context.env.locale ?? 'en');
             modelData ??= (0, data_1.loadModelModifiersData)(context.env.locale ?? 'en');
             // https://vuejs.org/api/built-in-directives.html#v-on
@@ -112,6 +111,10 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
+                    if (!context.language.vue) {
+                        return;
+                    }
+                    const vueCompilerOptions = context.language.vue.compilerOptions;
                     let sync;
                     let currentVersion;
                     const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
@@ -119,7 +122,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
                         // #4298: Precompute HTMLDocument before provideHtmlData to avoid parseHTMLDocument requesting component names from tsserver
                         baseServiceInstance.provideCompletionItems?.(document, position, completionContext, token);
-                        sync = (await provideHtmlData(sourceScript.id, sourceScript.generated.root)).sync;
+                        sync = (await provideHtmlData(vueCompilerOptions, sourceScript.id, sourceScript.generated.root)).sync;
                         currentVersion = await sync();
                     }
                     let htmlComplete = await baseServiceInstance.provideCompletionItems?.(document, position, completionContext, token);
@@ -138,6 +141,10 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
+                    if (!context.language.vue) {
+                        return;
+                    }
+                    const vueCompilerOptions = context.language.vue.compilerOptions;
                     const enabled = await context.env.getConfiguration?.('vue.inlayHints.missingProps') ?? false;
                     if (!enabled) {
                         return;
@@ -298,6 +305,10 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
+                    if (!context.language.vue) {
+                        return;
+                    }
+                    const vueCompilerOptions = context.language.vue.compilerOptions;
                     const languageService = context.inject('typescript/languageService');
                     if (!languageService) {
                         return;
@@ -314,7 +325,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                         files: context.language.scripts,
                         languageService,
                         typescript: ts,
-                        vueOptions: getVueOptions(context.env),
+                        vueOptions: vueCompilerOptions,
                     }, sourceScript.generated.root, template, {
                         start: document.offsetAt(range.start),
                         length: document.offsetAt(range.end) - document.offsetAt(range.start),
@@ -332,7 +343,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     });
                 },
             };
-            async function provideHtmlData(sourceDocumentUri, vueCode) {
+            async function provideHtmlData(vueCompilerOptions, sourceDocumentUri, vueCode) {
                 await (initializing ??= initialize());
                 const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri);
                 if (builtInData.tags) {
@@ -378,7 +389,9 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                                 })());
                                 return [];
                             }
-                            const scriptSetupRanges = vueCode.sfc.scriptSetup ? (0, language_core_1.parseScriptSetupRanges)(ts, vueCode.sfc.scriptSetup.ast, vueCompilerOptions) : undefined;
+                            const scriptSetupRanges = vueCode.sfc.scriptSetup
+                                ? (0, language_core_1.parseScriptSetupRanges)(ts, vueCode.sfc.scriptSetup.ast, vueCompilerOptions)
+                                : undefined;
                             const names = new Set();
                             const tags = [];
                             for (const tag of components) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.22",
+	"version": "2.0.23-alpha.1",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -16,23 +16,23 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.1",
-		"@volar/language-service": "~2.3.1",
-		"@volar/typescript": "~2.3.1",
+		"@volar/language-core": "~2.4.0-alpha.0",
+		"@volar/language-service": "~2.4.0-alpha.0",
+		"@volar/typescript": "~2.4.0-alpha.0",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.22",
+		"@vue/language-core": "2.0.23-alpha.1",
 		"@vue/shared": "^3.4.0",
-		"@vue/typescript-plugin": "2.0.22",
+		"@vue/typescript-plugin": "2.0.23-alpha.1",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.52",
-		"volar-service-emmet": "0.0.52",
-		"volar-service-html": "0.0.52",
-		"volar-service-json": "0.0.52",
-		"volar-service-pug": "0.0.52",
-		"volar-service-pug-beautify": "0.0.52",
-		"volar-service-typescript": "0.0.52",
-		"volar-service-typescript-twoslash-queries": "0.0.52",
+		"volar-service-css": "0.0.55",
+		"volar-service-emmet": "0.0.55",
+		"volar-service-html": "0.0.55",
+		"volar-service-json": "0.0.55",
+		"volar-service-pug": "0.0.55",
+		"volar-service-pug-beautify": "0.0.55",
+		"volar-service-typescript": "0.0.55",
+		"volar-service-typescript-twoslash-queries": "0.0.55",
 		"vscode-html-languageservice": "^5.2.0",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
@@ -40,8 +40,8 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.3.1",
+		"@volar/kit": "~2.4.0-alpha.0",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "884c8a553d4fd240167fcb97c6a738564f9d697a"
+	"gitHead": "70cb34e9d58afd603d50cb5b870116b189f4662b"
 }