@vue/language-core 3.0.0-beta.2 → 3.0.0-beta.4

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

@@ -149,7 +149,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
         };
         codeFeatures: {
             all: import("../types").VueCodeInformation;
-            none: import("../types").VueCodeInformation;
             verification: import("../types").VueCodeInformation;
             completion: import("../types").VueCodeInformation;
             additionalCompletion: import("../types").VueCodeInformation;
@@ -160,6 +159,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             navigationAndAdditionalCompletion: import("../types").VueCodeInformation;
             navigationAndVerification: import("../types").VueCodeInformation;
             withoutNavigation: import("../types").VueCodeInformation;
+            semanticWithoutHighlight: import("../types").VueCodeInformation;
             withoutHighlight: import("../types").VueCodeInformation;
             withoutHighlightAndNavigation: import("../types").VueCodeInformation;
             withoutHighlightAndCompletion: import("../types").VueCodeInformation;
@@ -167,6 +167,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             withoutSemantic: import("../types").VueCodeInformation;
         };
         resolveCodeFeatures: (features: import("../types").VueCodeInformation) => import("../types").VueCodeInformation;
+        inlineTsAsts: Map<string, import("typescript").SourceFile> | undefined;
         inVFor: boolean;
         slots: {
             name: string;

package/lib/plugins/vue-tsx.js

@@ -129,7 +129,8 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
     const getSetupSlotsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineSlots?.name);
     const getSetupPropsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineProps?.name);
     const getSetupInheritAttrs = (0, alien_signals_1.computed)(() => {
-        const value = getScriptSetupRanges()?.defineOptions?.inheritAttrs ?? getScriptRanges()?.exportDefault?.inheritAttrsOption;
+        const value = getScriptSetupRanges()?.defineOptions?.inheritAttrs
+            ?? getScriptRanges()?.exportDefault?.inheritAttrsOption;
         return value !== 'false';
     });
     const getComponentSelfName = (0, alien_signals_1.computed)(() => {

package/lib/utils/parseCssImports.js

@@ -7,7 +7,7 @@ function* parseCssImports(css) {
     for (const match of matches) {
         let text = match[0];
         let offset = match.index;
-        if (text.startsWith('\'') || text.startsWith('"')) {
+        if (text.startsWith("'") || text.startsWith('"')) {
             text = text.slice(1, -1);
             offset += 1;
         }

package/lib/utils/parseSfc.js

@@ -81,7 +81,7 @@ function createBlock(node, source) {
             start = {
                 line: start.line,
                 column: start.column + offset,
-                offset: start.offset + offset
+                offset: start.offset + offset,
             };
         }
         end = Object.assign({}, start);
@@ -89,14 +89,14 @@ function createBlock(node, source) {
     const loc = {
         source: content,
         start,
-        end
+        end,
     };
     const attrs = {};
     const block = {
         type,
         content,
         loc,
-        attrs
+        attrs,
     };
     node.props.forEach(p => {
         if (p.type === CompilerDOM.NodeTypes.ATTRIBUTE) {

package/lib/utils/ts.js

@@ -21,7 +21,7 @@ function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json, confi
             const rawOptions = obj?.vueCompilerOptions ?? {};
             resolver.addConfig(rawOptions, path_browserify_1.posix.dirname(configFile.fileName));
         }
-        catch (err) { }
+        catch { }
     }
     const resolvedVueOptions = resolver.build();
     if (skipGlobalTypesSetup) {
@@ -58,7 +58,7 @@ function createParsedCommandLine(ts, parseConfigHost, tsConfigPath, skipGlobalTy
                 const rawOptions = obj?.vueCompilerOptions ?? {};
                 resolver.addConfig(rawOptions, path_browserify_1.posix.dirname(configFile.fileName));
             }
-            catch (err) { }
+            catch { }
         }
         const resolvedVueOptions = resolver.build();
         if (skipGlobalTypesSetup) {
@@ -82,7 +82,7 @@ function createParsedCommandLine(ts, parseConfigHost, tsConfigPath, skipGlobalTy
             vueOptions: resolvedVueOptions,
         };
     }
-    catch (err) {
+    catch {
         // console.warn('Failed to resolve tsconfig path:', tsConfigPath, err);
         return {
             fileNames: [],
@@ -105,7 +105,7 @@ function proxyParseConfigHostForExtendConfigPaths(parseConfigHost) {
                 };
             }
             return target[key];
-        }
+        },
     });
     return {
         host,
@@ -176,7 +176,7 @@ class CompilerOptionsResolver {
             },
             fallthroughComponentNames: [
                 ...defaults.fallthroughComponentNames,
-                ...this.options.fallthroughComponentNames ?? []
+                ...this.options.fallthroughComponentNames ?? [],
             ].map(shared_2.hyphenateTag),
             // https://github.com/vuejs/vue-next/blob/master/packages/compiler-dom/src/transforms/vModel.ts#L49-L51
             // https://vuejs.org/guide/essentials/forms.html#form-input-bindings
@@ -205,7 +205,7 @@ function resolvePath(scriptPath, root) {
             // console.warn('failed to resolve path:', scriptPath, 'require.resolve is not supported in web');
         }
     }
-    catch (error) {
+    catch {
         // console.warn(error);
     }
 }
@@ -261,13 +261,13 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         plugins: [],
         experimentalModelPropName: {
             '': {
-                input: true
+                input: true,
             },
             value: {
                 input: { type: 'text' },
                 textarea: true,
-                select: true
-            }
+                select: true,
+            },
         },
     };
 }

package/lib/virtualFile/computedEmbeddedCodes.js

@@ -177,7 +177,8 @@ function computedPluginEmbeddedCodes(plugins, plugin, fileName, sfc, getBlockByN
                 if (mapping.data.__combineOffset !== undefined) {
                     const offsetMapping = mappings[i - mapping.data.__combineOffset];
                     if (typeof offsetMapping === 'string' || !offsetMapping) {
-                        throw new Error('Invalid offset mapping, mappings: ' + mappings.length + ', i: ' + i + ', offset: ' + mapping.data.__combineOffset);
+                        throw new Error('Invalid offset mapping, mappings: ' + mappings.length + ', i: ' + i + ', offset: '
+                            + mapping.data.__combineOffset);
                     }
                     offsetMapping.sourceOffsets.push(...mapping.sourceOffsets);
                     offsetMapping.generatedOffsets.push(...mapping.generatedOffsets);
@@ -235,16 +236,26 @@ function fullDiffTextChangeRange(oldText, newText) {
 }
 function resolveCommonLanguageId(lang) {
     switch (lang) {
-        case 'js': return 'javascript';
-        case 'cjs': return 'javascript';
-        case 'mjs': return 'javascript';
-        case 'ts': return 'typescript';
-        case 'cts': return 'typescript';
-        case 'mts': return 'typescript';
-        case 'jsx': return 'javascriptreact';
-        case 'tsx': return 'typescriptreact';
-        case 'pug': return 'jade';
-        case 'md': return 'markdown';
+        case 'js':
+            return 'javascript';
+        case 'cjs':
+            return 'javascript';
+        case 'mjs':
+            return 'javascript';
+        case 'ts':
+            return 'typescript';
+        case 'cts':
+            return 'typescript';
+        case 'mts':
+            return 'typescript';
+        case 'jsx':
+            return 'javascriptreact';
+        case 'tsx':
+            return 'typescriptreact';
+        case 'pug':
+            return 'jade';
+        case 'md':
+            return 'markdown';
     }
     return lang;
 }

package/lib/virtualFile/computedSfc.d.ts

@@ -1,4 +1,6 @@
+import type * as CompilerDOM from '@vue/compiler-dom';
 import type { SFCParseResult } from '@vue/compiler-sfc';
 import type * as ts from 'typescript';
 import type { Sfc, VueLanguagePluginReturn } from '../types';
+export declare const templateInlineTsAsts: WeakMap<CompilerDOM.RootNode, Map<string, ts.SourceFile>>;
 export declare function computedSfc(ts: typeof import('typescript'), plugins: VueLanguagePluginReturn[], fileName: string, getSnapshot: () => ts.IScriptSnapshot, getParseResult: () => SFCParseResult | undefined): Sfc;

package/lib/virtualFile/computedSfc.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.templateInlineTsAsts = void 0;
 exports.computedSfc = computedSfc;
 const alien_signals_1 = require("alien-signals");
 const parseCssClassNames_1 = require("../utils/parseCssClassNames");
 const parseCssImports_1 = require("../utils/parseCssImports");
 const parseCssVars_1 = require("../utils/parseCssVars");
 const signals_1 = require("../utils/signals");
+exports.templateInlineTsAsts = new WeakMap();
 function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     const getUntrackedSnapshot = () => {
         const pausedSub = (0, alien_signals_1.setCurrentSub)(undefined);
@@ -27,9 +29,15 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     const getTemplate = computedNullableSfcBlock('template', 'html', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.template ?? undefined), (_block, base) => {
         const compiledAst = computedTemplateAst(base);
         return mergeObject(base, {
-            get ast() { return compiledAst()?.ast; },
-            get errors() { return compiledAst()?.errors; },
-            get warnings() { return compiledAst()?.warnings; },
+            get ast() {
+                return compiledAst()?.ast;
+            },
+            get errors() {
+                return compiledAst()?.errors;
+            },
+            get warnings() {
+                return compiledAst()?.warnings;
+            },
         });
     });
     const getScript = computedNullableSfcBlock('script', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.script ?? undefined), (block, base) => {
@@ -44,8 +52,12 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get src() { return getSrc(); },
-            get ast() { return getAst(); },
+            get src() {
+                return getSrc();
+            },
+            get ast() {
+                return getAst();
+            },
         });
     });
     const getOriginalScriptSetup = computedNullableSfcBlock('scriptSetup', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.scriptSetup ?? undefined), (block, base) => {
@@ -60,15 +72,19 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get generic() { return getGeneric(); },
-            get ast() { return getAst(); },
+            get generic() {
+                return getGeneric();
+            },
+            get ast() {
+                return getAst();
+            },
         });
     });
     const hasScript = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.script);
     const hasScriptSetup = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.scriptSetup);
     const getScriptSetup = (0, alien_signals_1.computed)(() => {
         if (!hasScript() && !hasScriptSetup()) {
-            //#region monkey fix: https://github.com/vuejs/language-tools/pull/2113
+            // #region monkey fix: https://github.com/vuejs/language-tools/pull/2113
             return {
                 content: '',
                 lang: 'ts',
@@ -94,38 +110,86 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
         const getCssVars = (0, signals_1.computedItems)(() => [...(0, parseCssVars_1.parseCssVars)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         const getClassNames = (0, signals_1.computedItems)(() => [...(0, parseCssClassNames_1.parseCssClassNames)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         return () => mergeObject(base, {
-            get src() { return getSrc(); },
-            get module() { return getModule(); },
-            get scoped() { return getScoped(); },
-            get imports() { return getImports(); },
-            get cssVars() { return getCssVars(); },
-            get classNames() { return getClassNames(); },
+            get src() {
+                return getSrc();
+            },
+            get module() {
+                return getModule();
+            },
+            get scoped() {
+                return getScoped();
+            },
+            get imports() {
+                return getImports();
+            },
+            get cssVars() {
+                return getCssVars();
+            },
+            get classNames() {
+                return getClassNames();
+            },
         });
     });
     const customBlocks = (0, signals_1.computedArray)((0, alien_signals_1.computed)(() => getParseResult()?.descriptor.customBlocks ?? []), (getBlock, i) => {
         const base = computedSfcBlock('custom_block_' + i, 'txt', getBlock);
         const getType = (0, alien_signals_1.computed)(() => getBlock().type);
         return () => mergeObject(base, {
-            get type() { return getType(); },
+            get type() {
+                return getType();
+            },
         });
     });
     return {
-        get content() { return getContent(); },
-        get comments() { return getComments(); },
-        get template() { return getTemplate(); },
-        get script() { return getScript(); },
-        get scriptSetup() { return getScriptSetup(); },
-        get styles() { return styles; },
-        get customBlocks() { return customBlocks; },
+        get content() {
+            return getContent();
+        },
+        get comments() {
+            return getComments();
+        },
+        get template() {
+            return getTemplate();
+        },
+        get script() {
+            return getScript();
+        },
+        get scriptSetup() {
+            return getScriptSetup();
+        },
+        get styles() {
+            return styles;
+        },
+        get customBlocks() {
+            return customBlocks;
+        },
     };
     function computedTemplateAst(base) {
         let cache;
+        let inlineTsAsts;
+        function updateInlineTsAsts(newAst, oldAst) {
+            let newTsAsts = exports.templateInlineTsAsts.get(newAst);
+            if (!newTsAsts) {
+                exports.templateInlineTsAsts.set(newAst, newTsAsts = new Map());
+            }
+            const oldTsAsts = oldAst && exports.templateInlineTsAsts.get(oldAst) || inlineTsAsts;
+            if (oldTsAsts) {
+                for (const [text, ast] of oldTsAsts) {
+                    if (!ast.__volar_used) {
+                        oldTsAsts.delete(text);
+                    }
+                    else {
+                        newTsAsts.set(text, ast);
+                        ast.__volar_used = false;
+                    }
+                }
+            }
+            inlineTsAsts = new Map(newTsAsts);
+        }
         return (0, alien_signals_1.computed)(() => {
             if (cache?.template === base.content) {
                 return {
                     errors: [],
                     warnings: [],
-                    ast: cache?.result.ast,
+                    ast: cache.result.ast,
                 };
             }
             // incremental update
@@ -142,6 +206,7 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
                         newText,
                     });
                     if (newResult) {
+                        updateInlineTsAsts(newResult.ast, cache.result.ast);
                         cache.template = base.content;
                         cache.snapshot = getUntrackedSnapshot();
                         cache.result = newResult;
@@ -169,6 +234,9 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
                 let result;
                 try {
                     result = plugin.compileSFCTemplate?.(base.lang, base.content, options);
+                    if (result) {
+                        updateInlineTsAsts(result.ast, cache?.result.ast);
+                    }
                 }
                 catch (e) {
                     const err = e;
@@ -217,16 +285,31 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
         const getStartTagEnd = (0, alien_signals_1.computed)(() => getBlock().loc.start.offset);
         const getEndTagStart = (0, alien_signals_1.computed)(() => getBlock().loc.end.offset);
         const getStart = (0, alien_signals_1.computed)(() => getUntrackedSnapshot().getText(0, getStartTagEnd()).lastIndexOf('<' + getBlock().type));
-        const getEnd = (0, alien_signals_1.computed)(() => getEndTagStart() + getUntrackedSnapshot().getText(getEndTagStart(), getUntrackedSnapshot().getLength()).indexOf('>') + 1);
+        const getEnd = (0, alien_signals_1.computed)(() => getEndTagStart()
+            + getUntrackedSnapshot().getText(getEndTagStart(), getUntrackedSnapshot().getLength()).indexOf('>') + 1);
         return {
             name,
-            get lang() { return getLang(); },
-            get attrs() { return getAttrs(); },
-            get content() { return getContent(); },
-            get startTagEnd() { return getStartTagEnd(); },
-            get endTagStart() { return getEndTagStart(); },
-            get start() { return getStart(); },
-            get end() { return getEnd(); },
+            get lang() {
+                return getLang();
+            },
+            get attrs() {
+                return getAttrs();
+            },
+            get content() {
+                return getContent();
+            },
+            get startTagEnd() {
+                return getStartTagEnd();
+            },
+            get endTagStart() {
+                return getEndTagStart();
+            },
+            get start() {
+                return getStart();
+            },
+            get end() {
+                return getEnd();
+            },
         };
     }
     function computedAttrValue(key, base, getBlock) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.0-beta.2",
+	"version": "3.0.0-beta.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.14",
+		"@volar/language-core": "2.4.15",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/shared": "^3.5.0",
 		"alien-signals": "^2.0.5",
@@ -24,7 +24,7 @@
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/typescript": "2.4.14",
+		"@volar/typescript": "2.4.15",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
 	"peerDependencies": {
@@ -35,5 +35,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "ea40288f6fceebb65346732b6de5859c300cf1ee"
+	"gitHead": "5cb41faacbfe2d9e2d64637c6c1ae8769d9cba3f"
 }