@vue/language-service 3.0.7-alpha.0 → 3.0.7

package/lib/plugins/vue-scoped-class-links.js

@@ -12,14 +12,13 @@ function create() {
         create(context) {
             return {
                 provideDocumentLinks(document) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'template');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'template') {
                         return;
                     }
-                    const { sourceScript, root } = info;
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const codegen = language_core_1.tsCodegen.get(sfc);
-                    const option = root.vueCompilerOptions.resolveStyleClassNames;
+                    const option = info.root.vueCompilerOptions.resolveStyleClassNames;
                     const scopedClasses = codegen?.getGeneratedTemplate()?.scopedClasses ?? [];
                     const styleClasses = new Map();
                     for (let i = 0; i < sfc.styles.length; i++) {
@@ -27,8 +26,8 @@ function create() {
                         if (option !== true && !(option === 'scoped' && style.scoped)) {
                             continue;
                         }
-                        const styleDocumentUri = context.encodeEmbeddedDocumentUri(sourceScript.id, 'style_' + i);
-                        const styleVirtualCode = sourceScript.generated.embeddedCodes.get('style_' + i);
+                        const styleDocumentUri = context.encodeEmbeddedDocumentUri(info.script.id, 'style_' + i);
+                        const styleVirtualCode = info.script.generated.embeddedCodes.get('style_' + i);
                         if (!styleVirtualCode) {
                             continue;
                         }

package/lib/plugins/vue-sfc.js

@@ -16,14 +16,13 @@ function create() {
             return [sfcDataProvider];
         },
         async getFormattingOptions(document, options, context) {
-            const info = (0, utils_1.getEmbeddedInfo)(context, document, 'root_tags');
-            if (!info) {
+            const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+            if (info?.code.id !== 'root_tags') {
                 return {};
             }
-            const { root } = info;
             const formatSettings = await context.env.getConfiguration?.('html.format') ?? {};
             const blockTypes = ['template', 'script', 'style'];
-            for (const customBlock of root.sfc.customBlocks) {
+            for (const customBlock of info.root.sfc.customBlocks) {
                 blockTypes.push(customBlock.type);
             }
             return {
@@ -76,12 +75,11 @@ function create() {
                     return options;
                 },
                 async provideDiagnostics(document, token) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'root_tags');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'root_tags') {
                         return [];
                     }
-                    const { root } = info;
-                    const { vueSfc, sfc } = root;
+                    const { vueSfc, sfc } = info.root;
                     if (!vueSfc) {
                         return;
                     }
@@ -113,13 +111,12 @@ function create() {
                     ];
                 },
                 provideDocumentSymbols(document) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'root_tags');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'root_tags') {
                         return;
                     }
-                    const { root } = info;
                     const result = [];
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     if (sfc.template) {
                         result.push({
                             name: 'template',
@@ -185,7 +182,7 @@ function create() {
                     }
                     for (const customBlock of sfc.customBlocks) {
                         result.push({
-                            name: `${customBlock.type}`,
+                            name: customBlock.type,
                             kind: 2,
                             range: {
                                 start: document.positionAt(customBlock.start),

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

@@ -13,16 +13,15 @@ function create() {
             return {
                 isAdditionalCompletion: true,
                 async provideCompletionItems(document) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, id => id.startsWith('script_'));
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (!info?.code.id.startsWith('script_')) {
                         return;
                     }
-                    const { virtualCode, root } = info;
                     const enabled = await context.env.getConfiguration?.('vue.suggest.defineAssignment') ?? true;
                     if (!enabled) {
                         return;
                     }
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const codegen = language_core_1.tsCodegen.get(sfc);
                     const scriptSetup = sfc.scriptSetup;
                     const scriptSetupRanges = codegen?.getScriptSetupRanges();
@@ -30,7 +29,7 @@ function create() {
                         return;
                     }
                     const result = [];
-                    const mappings = [...context.language.maps.forEach(virtualCode)];
+                    const mappings = [...context.language.maps.forEach(info.code)];
                     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');

package/lib/plugins/vue-template-ref-links.js

@@ -12,21 +12,20 @@ function create() {
         create(context) {
             return {
                 provideDocumentLinks(document) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'scriptsetup_raw');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'scriptsetup_raw') {
                         return;
                     }
-                    const { sourceScript, root } = info;
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const codegen = language_core_1.tsCodegen.get(sfc);
                     if (!sfc.scriptSetup) {
                         return;
                     }
-                    const templateVirtualCode = sourceScript.generated.embeddedCodes.get('template');
+                    const templateVirtualCode = info.script.generated.embeddedCodes.get('template');
                     if (!templateVirtualCode) {
                         return;
                     }
-                    const templateDocumentUri = context.encodeEmbeddedDocumentUri(sourceScript.id, 'template');
+                    const templateDocumentUri = context.encodeEmbeddedDocumentUri(info.script.id, 'template');
                     const templateDocument = context.documents.get(templateDocumentUri, templateVirtualCode.languageId, templateVirtualCode.snapshot);
                     const templateRefs = codegen?.getGeneratedTemplate()?.templateRefs;
                     const useTemplateRefs = codegen?.getScriptSetupRanges()?.useTemplateRef ?? [];

package/lib/plugins/vue-template.js

@@ -128,12 +128,14 @@ function create(languageId, { getComponentNames, getElementAttrs, getComponentPr
                     disposable?.dispose();
                 },
                 async provideCompletionItems(document, position, completionContext, token) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'template', languageId);
-                    if (!info) {
+                    if (document.languageId !== languageId) {
                         return;
                     }
-                    const { sourceScript, root } = info;
-                    const { result: completionList, target, info: { components, propMap, }, } = await runWithVueData(sourceScript.id, root, () => baseServiceInstance.provideCompletionItems(document, position, completionContext, token));
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'template') {
+                        return;
+                    }
+                    const { result: completionList, target, info: { components, propMap, }, } = await runWithVueData(info.script.id, info.root, () => baseServiceInstance.provideCompletionItems(document, position, completionContext, token));
                     if (!completionList) {
                         return;
                     }
@@ -248,8 +250,11 @@ function create(languageId, { getComponentNames, getElementAttrs, getComponentPr
                     }
                 },
                 provideHover(document, position, token) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'template', languageId);
-                    if (!info) {
+                    if (document.languageId !== languageId) {
+                        return;
+                    }
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'template') {
                         return;
                     }
                     if (context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri))) {
@@ -341,7 +346,7 @@ function create(languageId, { getComponentNames, getElementAttrs, getComponentPr
                                 if (casing.tag === nameCasing_1.TagNameCasing.Kebab) {
                                     names.add((0, language_core_1.hyphenateTag)(tag));
                                 }
-                                else if (casing.tag === nameCasing_1.TagNameCasing.Pascal) {
+                                else {
                                     names.add(tag);
                                 }
                             }
@@ -350,7 +355,7 @@ function create(languageId, { getComponentNames, getElementAttrs, getComponentPr
                                 if (casing.tag === nameCasing_1.TagNameCasing.Kebab) {
                                     names.add((0, language_core_1.hyphenateTag)(name));
                                 }
-                                else if (casing.tag === nameCasing_1.TagNameCasing.Pascal) {
+                                else {
                                     names.add(name);
                                 }
                             }
@@ -572,7 +577,7 @@ function create(languageId, { getComponentNames, getElementAttrs, getComponentPr
                 for (const customDataPath of customData) {
                     for (const workspaceFolder of context.env.workspaceFolders) {
                         const uri = vscode_uri_1.Utils.resolvePath(workspaceFolder, customDataPath);
-                        const json = await context.env.fs?.readFile?.(uri);
+                        const json = await context.env.fs?.readFile(uri);
                         if (json) {
                             try {
                                 const data = JSON.parse(json);

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

@@ -13,14 +13,14 @@ function create({ getQuickInfoAtPosition }) {
         create(context) {
             return {
                 async provideInlayHints(document, range) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, id => id === 'template' || id.startsWith('script_'));
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'template' && !info?.code.id.startsWith('script_')) {
                         return;
                     }
-                    const { sourceScript, virtualCode, root } = info;
                     const hoverOffsets = [];
                     const inlayHints = [];
-                    const twoslashReg = virtualCode.id === 'template' ? twoslashTemplateReg : twoslashScriptReg;
+                    const twoslashReg = info.code.id === 'template' ? twoslashTemplateReg : twoslashScriptReg;
+                    const sourceDocument = context.documents.get(info.script.id, info.script.languageId, info.script.snapshot);
                     for (const pointer of document.getText(range).matchAll(twoslashReg)) {
                         const offset = pointer.index + pointer[0].indexOf('^?') + document.offsetAt(range.start);
                         const position = document.positionAt(offset);
@@ -32,11 +32,10 @@ function create({ getQuickInfoAtPosition }) {
                             }),
                         ]);
                     }
-                    const sourceDocument = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
                     for (const [pointerPosition, hoverOffset] of hoverOffsets) {
-                        const map = context.language.maps.get(virtualCode, sourceScript);
+                        const map = context.language.maps.get(info.code, info.script);
                         for (const [sourceOffset] of map.toSourceLocation(hoverOffset)) {
-                            const quickInfo = await getQuickInfoAtPosition(root.fileName, sourceDocument.positionAt(sourceOffset));
+                            const quickInfo = await getQuickInfoAtPosition(info.root.fileName, sourceDocument.positionAt(sourceOffset));
                             if (quickInfo) {
                                 inlayHints.push({
                                     position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/lib/types.d.ts

@@ -0,0 +1,13 @@
+export declare enum TagNameCasing {
+	Kebab = 0,
+	Pascal = 1,
+}
+export declare enum AttrNameCasing {
+	Kebab = 0,
+	Camel = 1,
+}
+export declare const commands: {
+	parseSfc: string;
+};
+export * from '@volar/language-service/lib/types';
+export * from '@vue/language-core/lib/types';

package/lib/types.js

@@ -0,0 +1,34 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 = exports.AttrNameCasing = exports.TagNameCasing = void 0;
+var TagNameCasing;
+(function (TagNameCasing) {
+    TagNameCasing[TagNameCasing["Kebab"] = 0] = "Kebab";
+    TagNameCasing[TagNameCasing["Pascal"] = 1] = "Pascal";
+})(TagNameCasing || (exports.TagNameCasing = TagNameCasing = {}));
+var AttrNameCasing;
+(function (AttrNameCasing) {
+    AttrNameCasing[AttrNameCasing["Kebab"] = 0] = "Kebab";
+    AttrNameCasing[AttrNameCasing["Camel"] = 1] = "Camel";
+})(AttrNameCasing || (exports.AttrNameCasing = AttrNameCasing = {}));
+exports.commands = {
+    parseSfc: 'vue.parseSfc',
+};
+// only export types of depend packages
+__exportStar(require("@volar/language-service/lib/types"), exports);
+__exportStar(require("@vue/language-core/lib/types"), exports);
+//# sourceMappingURL=types.js.map

package/lib/utils.d.ts

@@ -1,8 +1,8 @@
-import { type LanguageServiceContext, type SourceScript, type TextDocument } from '@volar/language-service';
-import { VueVirtualCode } from '@vue/language-core';
+import type { LanguageServiceContext, SourceScript } from '@volar/language-service';
+import type { VueVirtualCode } from '@vue/language-core';
 import { URI } from 'vscode-uri';
-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;
+export declare function resolveEmbeddedCode(context: LanguageServiceContext, uriStr: string): {
+    script: Required<SourceScript<URI>>;
+    code: import("@volar/language-service").VirtualCode;
     root: VueVirtualCode;
 } | undefined;

package/lib/utils.js

@@ -1,43 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEmbeddedInfo = getEmbeddedInfo;
-const language_core_1 = require("@vue/language-core");
+exports.resolveEmbeddedCode = resolveEmbeddedCode;
 const vscode_uri_1 = require("vscode-uri");
-function getEmbeddedInfo(context, document, embeddedCodeId, languageId) {
-    const uri = vscode_uri_1.URI.parse(document.uri);
+function resolveEmbeddedCode(context, uriStr) {
+    const uri = vscode_uri_1.URI.parse(uriStr);
     const decoded = context.decodeEmbeddedDocumentUri(uri);
     if (!decoded) {
         return;
     }
-    if (embeddedCodeId) {
-        if (typeof embeddedCodeId === 'string') {
-            if (decoded[1] !== embeddedCodeId) {
-                return;
-            }
-        }
-        else if (!embeddedCodeId(decoded[1])) {
-            return;
-        }
-    }
-    if (languageId && document.languageId !== languageId) {
-        return;
-    }
     const sourceScript = context.language.scripts.get(decoded[0]);
-    if (!sourceScript?.generated) {
-        return;
-    }
-    const virtualCode = sourceScript.generated.embeddedCodes.get(decoded[1]);
-    if (!virtualCode) {
-        return;
-    }
-    const root = sourceScript.generated.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
+    const code = sourceScript.generated.embeddedCodes.get(decoded[1]);
     return {
-        sourceScript: sourceScript,
-        virtualCode,
-        root,
+        script: sourceScript,
+        code,
+        root: sourceScript.generated.root,
     };
 }
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.0.7-alpha.0",
+	"version": "3.0.7",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "2.4.23",
-		"@vue/language-core": "3.0.7-alpha.0",
+		"@vue/language-core": "3.0.7",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.65",
@@ -37,8 +37,8 @@
 		"@volar/kit": "2.4.23",
 		"@volar/typescript": "2.4.23",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.0.7-alpha.0",
+		"@vue/typescript-plugin": "3.0.7",
 		"vscode-css-languageservice": "^6.3.1"
 	},
-	"gitHead": "a66f2330b5aa6f811f571159245c46af0c36c534"
+	"gitHead": "6022b75534487f8a031dfc61a7879f900b64d414"
 }