@vue/language-service 2.0.23-alpha.1 → 2.0.26-alpha.0

package/data/language-blocks/zh-cn.json

@@ -916,7 +916,7 @@
       ],
       "description": {
         "kind": "markdown",
-        "value": "\n在一个 `*.vue` 文件中可以为任何项目特定需求使用额外的自定义块。举例来说，一个用作写文档的 `<docs>` 块。这里是一些自定义块的真实用例：\n\n- [Gridsome：`<page-query>`](https://gridsome.org/docs/querying-data/)\n- [vite-plugin-vue-gql：`<gql>`](https://github.com/wheatjs/vite-plugin-vue-gql)\n- [vue-i18n：`<i18n>`](https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n#i18n-custom-block)\n\n自定义块的处理需要依赖工具链。如果你想要在构建中集成你的自定义语块，请参见 [SFC 自定义块集成工具链指南](https://cn.vuejs.org/guide/scaling-up/tooling.html#sfc-custom-block-integrations)获取更多细节。\n"
+        "value": "\n在一个 `*.vue` 文件中可以为任何项目特定需求使用额外的自定义块。举例来说，一个用作写文档的 `<docs>` 块。这里是一些自定义块的真实用例：\n\n- [Gridsome：`<page-query>`](https://gridsome.org/docs/querying-data/)\n- [vite-plugin-vue-gql：`<gql>`](https://github.com/wheatjs/vite-plugin-vue-gql)\n- [vue-i18n：`<i18n>`](https://github.com/intlify/bundle-tools/tree/main/packages/unplugin-vue-i18n#i18n-custom-block)\n\n自定义块的处理需要依赖工具链。如果你想要在构建中集成你的自定义语块，请参见 [SFC 自定义块集成工具链指南](https://cn.vuejs.org/guide/scaling-up/tooling.html#sfc-custom-block-integrations)获取更多细节。\n"
       },
       "references": [
         {

package/index.d.ts

@@ -3,13 +3,13 @@ export * from '@vue/language-core';
 export * from './lib/ideFeatures/nameCasing';
 export * from './lib/types';
 import type { LanguageServicePlugin } from '@volar/language-service';
+import { VueCompilerOptions } from '@vue/language-core';
+declare module '@volar/language-service' {
+    interface ProjectContext {
+        vue?: {
+            compilerOptions: VueCompilerOptions;
+        };
+    }
+}
 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,7 +14,6 @@ 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.commands = void 0;
 exports.getFullLanguageServicePlugins = getFullLanguageServicePlugins;
 exports.getHybridModeLanguageServicePlugins = getHybridModeLanguageServicePlugins;
 __exportStar(require("@volar/language-service"), exports);
@@ -62,12 +61,16 @@ function getFullLanguageServicePlugins(ts) {
                 ...plugin,
                 create(context) {
                     const created = plugin.create(context);
-                    if (!context.language.typescript) {
+                    if (!context.project.typescript) {
                         return created;
                     }
                     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);
+                    if (context.project.vue) {
+                        const proxy = (0, common_1.proxyLanguageServiceForVue)(ts, context.language, languageService, context.project.vue.compilerOptions, context.project.typescript.asUri);
+                        languageService.getCompletionsAtPosition = proxy.getCompletionsAtPosition;
+                        languageService.getCompletionEntryDetails = proxy.getCompletionEntryDetails;
+                        languageService.getCodeFixesAtPosition = proxy.getCodeFixesAtPosition;
+                        languageService.getQuickInfoAtPosition = proxy.getQuickInfoAtPosition;
                     }
                     return created;
                 },
@@ -77,7 +80,7 @@ function getFullLanguageServicePlugins(ts) {
     }
     return plugins;
     function getTsPluginClientForLSP(context) {
-        if (!context.language.typescript) {
+        if (!context.project.typescript) {
             return;
         }
         const languageService = context.inject('typescript/languageService');
@@ -88,9 +91,9 @@ function getFullLanguageServicePlugins(ts) {
             typescript: ts,
             language: context.language,
             languageService,
-            languageServiceHost: context.language.typescript.languageServiceHost,
+            languageServiceHost: context.project.typescript.languageServiceHost,
             isTsPlugin: false,
-            getFileId: context.language.typescript.asScriptId,
+            getFileId: context.project.typescript.asUri,
         };
         return {
             async collectExtractProps(...args) {
@@ -135,14 +138,6 @@ function getHybridModeLanguageServicePlugins(ts, getTsPluginClient) {
     }
     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),
@@ -171,7 +166,7 @@ function getCommonLanguageServicePlugins(ts, getTsPluginClient) {
             name: 'vue-parse-sfc',
             capabilities: {
                 executeCommandProvider: {
-                    commands: [exports.commands.parseSfc],
+                    commands: [types_1.commands.parseSfc],
                 },
             },
             create() {
@@ -187,30 +182,30 @@ function getCommonLanguageServicePlugins(ts, getTsPluginClient) {
             capabilities: {
                 executeCommandProvider: {
                     commands: [
-                        exports.commands.detectNameCasing,
-                        exports.commands.convertTagsToKebabCase,
-                        exports.commands.convertTagsToPascalCase,
-                        exports.commands.convertPropsToKebabCase,
-                        exports.commands.convertPropsToCamelCase,
+                        types_1.commands.detectNameCasing,
+                        types_1.commands.convertTagsToKebabCase,
+                        types_1.commands.convertTagsToPascalCase,
+                        types_1.commands.convertPropsToKebabCase,
+                        types_1.commands.convertPropsToCamelCase,
                     ],
                 }
             },
             create(context) {
                 return {
                     executeCommand(command, [uri]) {
-                        if (command === exports.commands.detectNameCasing) {
+                        if (command === types_1.commands.detectNameCasing) {
                             return (0, nameCasing_1.detect)(context, vscode_uri_1.URI.parse(uri));
                         }
-                        else if (command === exports.commands.convertTagsToKebabCase) {
+                        else if (command === types_1.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) {
+                        else if (command === types_1.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) {
+                        else if (command === types_1.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) {
+                        else if (command === types_1.commands.convertPropsToCamelCase) {
                             return (0, nameCasing_1.convertAttrName)(context, vscode_uri_1.URI.parse(uri), types_1.AttrNameCasing.Camel, getTsPluginClient(context));
                         }
                     },

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

@@ -56,7 +56,7 @@ function create(ts, getTsPluginClient) {
                     }
                     let ast;
                     let sourceCodeOffset = document.offsetAt(selection);
-                    const fileName = context.language.typescript?.asFileName(sourceScript.id)
+                    const fileName = context.project.typescript?.asFileName(sourceScript.id)
                         ?? sourceScript.id.fsPath.replace(/\\/g, '/');
                     if (sourceScript.generated) {
                         const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);

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

@@ -15,12 +15,12 @@ function create(ts, getTsPluginClient) {
         // documentDropEditsProvider: true,
         },
         create(context) {
-            if (!context.language.vue) {
+            if (!context.project.vue) {
                 return {};
             }
             let casing = types_1.TagNameCasing.Pascal; // TODO
             const tsPluginClient = getTsPluginClient?.(context);
-            const vueCompilerOptions = context.language.vue.compilerOptions;
+            const vueCompilerOptions = context.project.vue.compilerOptions;
             return {
                 async provideDocumentDropEdits(document, _position, dataTransfer) {
                     if (document.languageId !== 'html') {
@@ -53,7 +53,7 @@ function create(ts, getTsPluginClient) {
                     const additionalEdit = {};
                     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))
+                    const incomingFileName = context.project.typescript?.asFileName(vscode_uri_1.URI.parse(importUri))
                         ?? vscode_uri_1.URI.parse(importUri).fsPath.replace(/\\/g, '/');
                     let importPath;
                     const serviceScript = sourceScript.generated?.languagePlugin.typescript?.getServiceScript(vueVirtualCode);

package/lib/plugins/vue-sfc.js

@@ -154,6 +154,18 @@ function create() {
                         return result;
                     });
                 },
+                async provideCompletionItems(document, position, context, token) {
+                    const result = await htmlPluginInstance.provideCompletionItems?.(document, position, context, token);
+                    if (!result) {
+                        return;
+                    }
+                    result.items = [
+                        ...result.items.filter(item => item.label !== '!DOCTYPE' && item.label !== 'Custom Blocks'),
+                        createCompletionItemWithTs(result.items.find(item => item.label === 'script')),
+                        createCompletionItemWithTs(result.items.find(item => item.label === 'script setup')),
+                    ];
+                    return result;
+                },
             };
         },
     };
@@ -166,4 +178,14 @@ function create() {
         }
     }
 }
+function createCompletionItemWithTs(base) {
+    return {
+        ...base,
+        label: base.label + ' lang="ts"',
+        textEdit: {
+            ...base.textEdit,
+            newText: base.textEdit.newText + ' lang="ts"',
+        }
+    };
+}
 //# sourceMappingURL=vue-sfc.js.map

package/lib/plugins/vue-template.js

@@ -111,10 +111,10 @@ function create(mode, ts, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
-                    if (!context.language.vue) {
+                    if (!context.project.vue) {
                         return;
                     }
-                    const vueCompilerOptions = context.language.vue.compilerOptions;
+                    const vueCompilerOptions = context.project.vue.compilerOptions;
                     let sync;
                     let currentVersion;
                     const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
@@ -141,10 +141,10 @@ function create(mode, ts, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
-                    if (!context.language.vue) {
+                    if (!context.project.vue) {
                         return;
                     }
-                    const vueCompilerOptions = context.language.vue.compilerOptions;
+                    const vueCompilerOptions = context.project.vue.compilerOptions;
                     const enabled = await context.env.getConfiguration?.('vue.inlayHints.missingProps') ?? false;
                     if (!enabled) {
                         return;
@@ -305,10 +305,10 @@ function create(mode, ts, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
-                    if (!context.language.vue) {
+                    if (!context.project.vue) {
                         return;
                     }
-                    const vueCompilerOptions = context.language.vue.compilerOptions;
+                    const vueCompilerOptions = context.project.vue.compilerOptions;
                     const languageService = context.inject('typescript/languageService');
                     if (!languageService) {
                         return;

package/lib/types.d.ts

@@ -6,5 +6,13 @@ export declare enum AttrNameCasing {
     Kebab = 0,
     Camel = 1
 }
+export declare const commands: {
+    parseSfc: string;
+    detectNameCasing: string;
+    convertTagsToKebabCase: string;
+    convertTagsToPascalCase: string;
+    convertPropsToKebabCase: string;
+    convertPropsToCamelCase: string;
+};
 export * from '@volar/language-service/lib/types';
 export * from '@vue/language-core/lib/types';

package/lib/types.js

@@ -14,7 +14,7 @@ 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.AttrNameCasing = exports.TagNameCasing = void 0;
+exports.commands = exports.AttrNameCasing = exports.TagNameCasing = void 0;
 var TagNameCasing;
 (function (TagNameCasing) {
     TagNameCasing[TagNameCasing["Kebab"] = 0] = "Kebab";
@@ -25,6 +25,14 @@ var AttrNameCasing;
     AttrNameCasing[AttrNameCasing["Kebab"] = 0] = "Kebab";
     AttrNameCasing[AttrNameCasing["Camel"] = 1] = "Camel";
 })(AttrNameCasing || (exports.AttrNameCasing = AttrNameCasing = {}));
+exports.commands = {
+    parseSfc: 'vue.parseSfc',
+    detectNameCasing: 'vue.detectNameCasing',
+    convertTagsToKebabCase: 'vue.convertTagsToKebabCase',
+    convertTagsToPascalCase: 'vue.convertTagsToPascalCase',
+    convertPropsToKebabCase: 'vue.convertPropsToKebabCase',
+    convertPropsToCamelCase: 'vue.convertPropsToCamelCase',
+};
 // only export types of depend packages
 __exportStar(require("@volar/language-service/lib/types"), exports);
 __exportStar(require("@vue/language-core/lib/types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.23-alpha.1",
+	"version": "2.0.26-alpha.0",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -16,23 +16,23 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.0-alpha.0",
-		"@volar/language-service": "~2.4.0-alpha.0",
-		"@volar/typescript": "~2.4.0-alpha.0",
+		"@volar/language-core": "~2.4.0-alpha.11",
+		"@volar/language-service": "~2.4.0-alpha.11",
+		"@volar/typescript": "~2.4.0-alpha.11",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.23-alpha.1",
+		"@vue/language-core": "2.0.26-alpha.0",
 		"@vue/shared": "^3.4.0",
-		"@vue/typescript-plugin": "2.0.23-alpha.1",
+		"@vue/typescript-plugin": "2.0.26-alpha.0",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"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",
+		"volar-service-css": "volar-2.4",
+		"volar-service-emmet": "volar-2.4",
+		"volar-service-html": "volar-2.4",
+		"volar-service-json": "volar-2.4",
+		"volar-service-pug": "volar-2.4",
+		"volar-service-pug-beautify": "volar-2.4",
+		"volar-service-typescript": "volar-2.4",
+		"volar-service-typescript-twoslash-queries": "volar-2.4",
 		"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.4.0-alpha.0",
+		"@volar/kit": "~2.4.0-alpha.11",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "70cb34e9d58afd603d50cb5b870116b189f4662b"
+	"gitHead": "7ace5046de671cda22fac8dd7d71b3658489c5c6"
 }