@vue/language-service 3.0.7-alpha.1 → 3.0.8

package/index.d.ts

@@ -1,3 +1,4 @@
 export * from '@volar/language-service';
 export * from '@volar/language-service/lib/utils/featureWorkers';
-export declare function createVueLanguageServicePlugins(ts: typeof import('typescript'), tsPluginClient?: import('@vue/typescript-plugin/lib/requests').Requests): import("@volar/language-service").LanguageServicePlugin<any>[];
+import type { Requests } from '@vue/typescript-plugin/lib/requests';
+export declare function createVueLanguageServicePlugins(ts: typeof import('typescript'), client?: Requests): import("@volar/language-service").LanguageServicePlugin<any>[];

package/index.js

@@ -43,12 +43,12 @@ const vue_suggest_define_assignment_1 = require("./lib/plugins/vue-suggest-defin
 const vue_template_1 = require("./lib/plugins/vue-template");
 const vue_template_ref_links_1 = require("./lib/plugins/vue-template-ref-links");
 const vue_twoslash_queries_1 = require("./lib/plugins/vue-twoslash-queries");
-function createVueLanguageServicePlugins(ts, tsPluginClient) {
-    tsPluginClient ??= new Proxy({}, {
-        get() {
-            return () => undefined;
-        },
-    });
+const noop = () => { };
+function createVueLanguageServicePlugins(ts, client = new Proxy({}, {
+    get() {
+        return noop;
+    },
+})) {
     return [
         (0, css_1.create)(),
         (0, volar_service_json_1.create)(),
@@ -72,16 +72,16 @@ function createVueLanguageServicePlugins(ts, tsPluginClient) {
         (0, syntactic_1.create)(ts),
         (0, vue_inlayhints_1.create)(ts),
         // type aware plugins
-        (0, typescript_semantic_tokens_1.create)(tsPluginClient),
-        (0, vue_autoinsert_dotvalue_1.create)(ts, tsPluginClient),
-        (0, vue_component_semantic_tokens_1.create)(tsPluginClient),
-        (0, vue_document_drop_1.create)(ts, tsPluginClient),
-        (0, vue_document_highlights_1.create)(tsPluginClient),
-        (0, vue_extract_file_1.create)(ts, tsPluginClient),
-        (0, vue_missing_props_hints_1.create)(tsPluginClient),
-        (0, vue_template_1.create)('html', tsPluginClient),
-        (0, vue_template_1.create)('jade', tsPluginClient),
-        (0, vue_twoslash_queries_1.create)(tsPluginClient),
+        (0, typescript_semantic_tokens_1.create)(client),
+        (0, vue_autoinsert_dotvalue_1.create)(ts, client),
+        (0, vue_component_semantic_tokens_1.create)(client),
+        (0, vue_document_drop_1.create)(ts, client),
+        (0, vue_document_highlights_1.create)(client),
+        (0, vue_extract_file_1.create)(ts, client),
+        (0, vue_missing_props_hints_1.create)(client),
+        (0, vue_template_1.create)('html', client),
+        (0, vue_template_1.create)('jade', client),
+        (0, vue_twoslash_queries_1.create)(client),
     ];
 }
 //# sourceMappingURL=index.js.map

package/lib/nameCasing.d.ts

@@ -9,6 +9,6 @@ export declare enum AttrNameCasing {
     Camel = 1
 }
 export declare function checkCasing(context: LanguageServiceContext, uri: URI): Promise<{
-    tag: TagNameCasing;
-    attr: AttrNameCasing;
+    tag: TagNameCasing | undefined;
+    attr: AttrNameCasing | undefined;
 }>;

package/lib/plugins/css.js

@@ -44,17 +44,16 @@ function create() {
                 },
             };
             function isWithinNavigationVirtualCode(document, position) {
-                const info = (0, utils_1.getEmbeddedInfo)(context, document, id => id.startsWith('style_'));
-                if (!info) {
+                const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                if (!info?.code.id.startsWith('style_')) {
                     return false;
                 }
-                const { sourceScript, virtualCode, root } = info;
-                const block = root.sfc.styles.find(style => style.name === virtualCode.id);
+                const block = info.root.sfc.styles.find(style => style.name === info.code.id);
                 if (!block) {
                     return false;
                 }
                 let script;
-                for (const [key, value] of sourceScript.generated.embeddedCodes) {
+                for (const [key, value] of info.script.generated.embeddedCodes) {
                     if (key.startsWith('script_')) {
                         script = value;
                         break;

package/lib/plugins/typescript-semantic-tokens.js

@@ -37,18 +37,17 @@ function create({ getEncodedSemanticClassifications }) {
         create(context) {
             return {
                 async provideDocumentSemanticTokens(document, range, legend) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'main');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.script.id.scheme !== 'file' || info.code.id !== 'main') {
                         return;
                     }
-                    const { root } = info;
                     const start = document.offsetAt(range.start);
                     const end = document.offsetAt(range.end);
                     const span = {
                         start: start,
                         length: end - start,
                     };
-                    const classifications = await getEncodedSemanticClassifications(root.fileName, span);
+                    const classifications = await getEncodedSemanticClassifications(info.root.fileName, span);
                     if (classifications) {
                         return (0, semanticTokens_1.convertClassificationsToSemanticTokens)(document, span, legend, classifications);
                     }

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

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

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
 const language_core_1 = require("@vue/language-core");
 const utils_1 = require("../utils");
-function create(ts, { getPropertiesAtLocation }) {
+function create(ts, { isRefAtPosition }) {
     return {
         name: 'vue-autoinsert-dotvalue',
         capabilities: {
@@ -15,8 +15,8 @@ function create(ts, { getPropertiesAtLocation }) {
         create(context) {
             return {
                 async provideAutoInsertSnippet(document, selection, change) {
-                    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;
                     }
                     // selection must at end of change
@@ -27,10 +27,9 @@ function create(ts, { getPropertiesAtLocation }) {
                         return;
                     }
                     let sourceOffset;
-                    const { sourceScript, virtualCode, root } = info;
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const scriptBlocks = [sfc.script, sfc.scriptSetup].filter(block => !!block);
-                    const map = context.language.maps.get(virtualCode, sourceScript);
+                    const map = context.language.maps.get(info.code, info.script);
                     if (!scriptBlocks.length) {
                         return;
                     }
@@ -49,8 +48,7 @@ function create(ts, { getPropertiesAtLocation }) {
                             return;
                         }
                     }
-                    const props = await getPropertiesAtLocation(root.fileName, sourceOffset) ?? [];
-                    if (props.some(prop => prop === 'value')) {
+                    if (await isRefAtPosition(info.root.fileName, sourceOffset)) {
                         return '${1:.value}';
                     }
                 },

package/lib/plugins/vue-compiler-dom-errors.js

@@ -14,12 +14,11 @@ function create() {
         create(context) {
             return {
                 provideDiagnostics(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 { root } = info;
-                    const { template } = root.sfc;
+                    const { template } = info.root.sfc;
                     if (!template) {
                         return;
                     }

package/lib/plugins/vue-component-semantic-tokens.js

@@ -17,20 +17,19 @@ function create({ getComponentNames, getElementNames }) {
         create(context) {
             return {
                 async provideDocumentSemanticTokens(document, range, legend) {
-                    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 { root } = info;
-                    const { template } = root.sfc;
+                    const { template } = info.root.sfc;
                     if (!template?.ast) {
                         return;
                     }
                     const componentSpans = [];
                     const start = document.offsetAt(range.start);
                     const end = document.offsetAt(range.end);
-                    const validComponentNames = await getComponentNames(root.fileName) ?? [];
-                    const elements = new Set(await getElementNames(root.fileName) ?? []);
+                    const validComponentNames = await getComponentNames(info.root.fileName) ?? [];
+                    const elements = new Set(await getElementNames(info.root.fileName) ?? []);
                     const components = new Set([
                         ...validComponentNames,
                         ...validComponentNames.map(language_core_1.hyphenateTag),

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

@@ -18,48 +18,50 @@ function create(ts, { getImportPathForFile }) {
         create(context) {
             return {
                 async provideDocumentDropEdits(document, _position, dataTransfer) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'template', 'html');
-                    if (!info) {
+                    if (document.languageId !== 'html') {
+                        return;
+                    }
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'template') {
                         return;
                     }
-                    const { sourceScript, root } = info;
                     let importUri;
                     for (const [mimeType, item] of dataTransfer) {
                         if (mimeType === 'text/uri-list') {
                             importUri = item.value;
                         }
                     }
-                    if (!importUri || !root.vueCompilerOptions.extensions.some(ext => importUri.endsWith(ext))) {
+                    if (!importUri || !info.root.vueCompilerOptions.extensions.some(ext => importUri.endsWith(ext))) {
                         return;
                     }
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!script) {
                         return;
                     }
-                    const casing = await (0, nameCasing_1.checkCasing)(context, sourceScript.id);
+                    const casing = await (0, nameCasing_1.checkCasing)(context, info.script.id);
                     const baseName = path_browserify_1.posix.basename(importUri);
                     const newName = (0, shared_1.capitalize)((0, shared_1.camelize)(baseName.slice(0, baseName.lastIndexOf('.'))));
                     const additionalEdit = {};
-                    const code = [...(0, language_core_1.forEachEmbeddedCode)(root)].find(code => code.id === (sfc.scriptSetup ? 'scriptsetup_raw' : 'script_raw'));
+                    const code = [...(0, language_core_1.forEachEmbeddedCode)(info.root)].find(code => code.id === (sfc.scriptSetup ? 'scriptsetup_raw' : 'script_raw'));
                     const lastImportNode = (0, vue_extract_file_1.getLastImportNode)(ts, script.ast);
                     const incomingFileName = vscode_uri_1.URI.parse(importUri).fsPath.replace(/\\/g, '/');
                     let importPath;
-                    const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(root);
+                    const serviceScript = info.script.generated.languagePlugin.typescript?.getServiceScript(info.root);
                     if (serviceScript) {
-                        const tsDocumentUri = context.encodeEmbeddedDocumentUri(sourceScript.id, serviceScript.code.id);
+                        const tsDocumentUri = context.encodeEmbeddedDocumentUri(info.script.id, serviceScript.code.id);
                         const tsDocument = context.documents.get(tsDocumentUri, serviceScript.code.languageId, serviceScript.code.snapshot);
                         const preferences = await (0, getUserPreferences_1.getUserPreferences)(context, tsDocument);
-                        importPath = (await getImportPathForFile(root.fileName, incomingFileName, preferences) ?? {}).path;
+                        importPath = await getImportPathForFile(info.root.fileName, incomingFileName, preferences);
                     }
                     if (!importPath) {
-                        importPath = path_browserify_1.posix.relative(path_browserify_1.posix.dirname(root.fileName), incomingFileName)
+                        importPath = path_browserify_1.posix.relative(path_browserify_1.posix.dirname(info.root.fileName), incomingFileName)
                             || importUri.slice(importUri.lastIndexOf('/') + 1);
                         if (!importPath.startsWith('./') && !importPath.startsWith('../')) {
                             importPath = './' + importPath;
                         }
                     }
-                    const embeddedDocumentUriStr = context.encodeEmbeddedDocumentUri(sourceScript.id, code.id).toString();
+                    const embeddedDocumentUriStr = context.encodeEmbeddedDocumentUri(info.script.id, code.id).toString();
                     additionalEdit.changes ??= {};
                     additionalEdit.changes[embeddedDocumentUriStr] = [];
                     additionalEdit.changes[embeddedDocumentUriStr].push({

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

@@ -12,12 +12,11 @@ function create({ getDocumentHighlights }) {
         create(context) {
             return {
                 async provideDocumentHighlights(document, position) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'main');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.script.id.scheme !== 'file' || info.code.id !== 'main') {
                         return;
                     }
-                    const { root } = info;
-                    const { template } = root.sfc;
+                    const { template } = info.root.sfc;
                     const offset = document.offsetAt(position);
                     if (template?.ast && offset >= template.startTagEnd && offset <= template.endTagStart) {
                         const pos = offset - template.startTagEnd;
@@ -32,9 +31,9 @@ function create({ getDocumentHighlights }) {
                             }
                         }
                     }
-                    const result = await getDocumentHighlights(root.fileName, offset);
+                    const result = await getDocumentHighlights(info.root.fileName, offset);
                     return result
-                        ?.filter(({ fileName }) => fileName === root.fileName)
+                        ?.filter(({ fileName }) => fileName === info.root.fileName)
                         .flatMap(({ highlightSpans }) => highlightSpans)
                         .map(({ textSpan, kind }) => ({
                         range: {

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

@@ -27,12 +27,11 @@ function create(ts, { collectExtractProps }) {
                     if (startOffset === endOffset) {
                         return;
                     }
-                    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 { root } = info;
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return;
@@ -56,12 +55,11 @@ function create(ts, { collectExtractProps }) {
                 async resolveCodeAction(codeAction) {
                     const { uri, range, newName } = codeAction.data;
                     const [startOffset, endOffset] = range;
-                    const info = (0, utils_1.getEmbeddedInfo)(context, { uri }, 'template');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, uri);
+                    if (info?.code.id !== 'template') {
                         return codeAction;
                     }
-                    const { sourceScript, virtualCode, root } = info;
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return codeAction;
@@ -70,12 +68,12 @@ function create(ts, { collectExtractProps }) {
                     if (!templateCodeRange) {
                         return codeAction;
                     }
-                    const toExtract = await collectExtractProps(root.fileName, templateCodeRange) ?? [];
+                    const toExtract = await collectExtractProps(info.root.fileName, templateCodeRange) ?? [];
                     const templateInitialIndent = await context.env.getConfiguration('vue.format.template.initialIndent') ?? true;
                     const scriptInitialIndent = await context.env.getConfiguration('vue.format.script.initialIndent')
                         ?? false;
-                    const document = context.documents.get(vscode_uri_1.URI.parse(uri), virtualCode.languageId, virtualCode.snapshot);
-                    const sfcDocument = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
+                    const document = context.documents.get(vscode_uri_1.URI.parse(uri), info.code.languageId, info.code.snapshot);
+                    const sfcDocument = context.documents.get(info.script.id, info.script.languageId, info.script.snapshot);
                     const newUri = sfcDocument.uri.slice(0, sfcDocument.uri.lastIndexOf('/') + 1) + `${newName}.vue`;
                     const lastImportNode = getLastImportNode(ts, script.ast);
                     let newFileTags = [];
@@ -136,7 +134,7 @@ function create(ts, { collectExtractProps }) {
                                 // editing vue sfc
                                 {
                                     textDocument: {
-                                        uri: sourceScript.id.toString(),
+                                        uri: info.script.id.toString(),
                                         version: null,
                                     },
                                     edits: sfcEdits,
@@ -261,7 +259,7 @@ function createAddComponentToOptionEdit(ts, sfc, ast, componentName) {
             newText: unescape(printText.replace(unicodeReg, '%u')),
         };
     }
-    else if (exportDefault.args && exportDefault.argsNode) {
+    else {
         const newNode = {
             ...exportDefault.argsNode,
             properties: [

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

@@ -14,16 +14,15 @@ function create() {
         create(context) {
             return {
                 provideDiagnostics(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 { sourceScript, root } = info;
-                    if (sourceScript.id.scheme !== 'file') {
+                    if (info.script.id.scheme !== 'file') {
                         return;
                     }
-                    const { vueCompilerOptions } = root;
-                    const globalTypesPath = vueCompilerOptions.globalTypesPath(root.fileName);
+                    const { vueCompilerOptions } = info.root;
+                    const globalTypesPath = vueCompilerOptions.globalTypesPath(info.root.fileName);
                     if (globalTypesPath) {
                         return;
                     }

package/lib/plugins/vue-inlayhints.js

@@ -13,21 +13,20 @@ function create(ts) {
         create(context) {
             return {
                 async provideInlayHints(document, range) {
-                    const info = (0, utils_1.getEmbeddedInfo)(context, document, 'main');
-                    if (!info) {
+                    const info = (0, utils_1.resolveEmbeddedCode)(context, document.uri);
+                    if (info?.code.id !== 'main') {
                         return;
                     }
-                    const { root } = info;
                     const settings = {};
                     async function getSettingEnabled(key) {
                         return settings[key] ??= await context.env.getConfiguration?.(key) ?? false;
                     }
                     const result = [];
-                    const { sfc } = root;
+                    const { sfc } = info.root;
                     const codegen = language_core_1.tsCodegen.get(sfc);
                     const inlayHints = [
                         ...codegen?.getGeneratedTemplate()?.inlayHints ?? [],
-                        ...codegen?.getGeneratedScript()?.inlayHints ?? [],
+                        ...codegen?.getGeneratedScript().inlayHints ?? [],
                     ];
                     const scriptSetupRanges = codegen?.getScriptSetupRanges();
                     if (scriptSetupRanges?.defineProps?.destructured && sfc.scriptSetup?.ast) {
@@ -96,7 +95,6 @@ function findDestructuredProps(ts, ast, props) {
     const scopeStack = [rootScope];
     let currentScope = rootScope;
     const excludedIds = new WeakSet();
-    const parentStack = [];
     for (const prop of props) {
         rootScope[prop] = true;
     }
@@ -176,9 +174,6 @@ function findDestructuredProps(ts, ast, props) {
             }
         });
         function enter(node) {
-            if (parent) {
-                parentStack.push(parent);
-            }
             if (ts.isTypeLiteralNode(node)
                 || ts.isTypeReferenceNode(node)) {
                 return false;
@@ -218,9 +213,6 @@ function findDestructuredProps(ts, ast, props) {
             }
         }
         function leave(node) {
-            if (parent) {
-                parentStack.pop();
-            }
             if (ts.isFunctionLike(node)
                 || ts.isCatchClause(node)
                 || (ts.isBlock(node)

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

@@ -15,11 +15,10 @@ function create({ getComponentNames, getElementNames, getComponentProps }) {
             let intrinsicElementNames;
             return {
                 async provideInlayHints(document, range, cancellationToken) {
-                    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 enabled = await context.env.getConfiguration?.('vue.inlayHints.missingProps') ?? false;
                     if (!enabled) {
                         return;
@@ -29,10 +28,10 @@ function create({ getComponentNames, getElementNames, getComponentProps }) {
                         return;
                     }
                     const result = [];
-                    const casing = await (0, nameCasing_1.checkCasing)(context, sourceScript.id);
-                    const components = await getComponentNames(root.fileName) ?? [];
-                    const componentProps = {};
-                    intrinsicElementNames ??= new Set(await getElementNames(root.fileName) ?? []);
+                    const casing = await (0, nameCasing_1.checkCasing)(context, info.script.id);
+                    const components = await getComponentNames(info.root.fileName) ?? [];
+                    const componentProps = new Map();
+                    intrinsicElementNames ??= new Set(await getElementNames(info.root.fileName) ?? []);
                     let token;
                     let current;
                     while ((token = scanner.scan()) !== html.TokenType.EOS) {
@@ -51,16 +50,16 @@ function create({ getComponentNames, getElementNames, getComponentProps }) {
                             if (tagOffset > document.offsetAt(range.end)) {
                                 break;
                             }
-                            if (!componentProps[checkTag]) {
+                            if (!componentProps.has(checkTag)) {
                                 if (cancellationToken.isCancellationRequested) {
                                     break;
                                 }
-                                componentProps[checkTag] = (await getComponentProps(root.fileName, checkTag) ?? [])
+                                componentProps.set(checkTag, (await getComponentProps(info.root.fileName, checkTag) ?? [])
                                     .filter(prop => prop.required)
-                                    .map(prop => prop.name);
+                                    .map(prop => prop.name));
                             }
                             current = {
-                                unburnedRequiredProps: [...componentProps[checkTag]],
+                                unburnedRequiredProps: [...componentProps.get(checkTag)],
                                 labelOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
                             };
                         }
@@ -86,7 +85,7 @@ function create({ getComponentNames, getElementNames, getComponentProps }) {
                                         attrText = attrText.slice('v-model:'.length);
                                     }
                                     else if (attrText === 'v-model') {
-                                        attrText = root.vueCompilerOptions.target >= 3 ? 'modelValue' : 'value'; // TODO: support for experimentalModelPropName?
+                                        attrText = info.root.vueCompilerOptions.target >= 3 ? 'modelValue' : 'value'; // TODO: support for experimentalModelPropName?
                                     }
                                     else if (attrText.startsWith('v-on:')) {
                                         attrText = 'on-' + (0, language_core_1.hyphenateAttr)(attrText.slice('v-on:'.length));

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/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.1",
+	"version": "3.0.8",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "2.4.23",
-		"@vue/language-core": "3.0.7-alpha.1",
+		"@vue/language-core": "3.0.8",
 		"@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.1",
+		"@vue/typescript-plugin": "3.0.8",
 		"vscode-css-languageservice": "^6.3.1"
 	},
-	"gitHead": "320fc626c871e9ff17c0e4e92ea7ddb0c7641f34"
+	"gitHead": "f7bdeaa7bb476df1fc8ff46c504d75c1869b0be9"
 }