@vue/language-core 3.0.7 → 3.1.0-alpha.0

package/lib/compilerOptions.js

@@ -245,9 +245,7 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         ],
         dataAttributes: [],
         htmlAttributes: ['aria-*'],
-        optionsWrapper: target >= 2.7
-            ? [`(await import('${lib}')).defineComponent(`, `)`]
-            : [`(await import('${lib}')).default.extend(`, `)`],
+        optionsWrapper: [`(await import('${lib}')).defineComponent(`, `)`],
         macros: {
             defineProps: ['defineProps'],
             defineSlots: ['defineSlots'],

package/lib/languagePlugin.js

@@ -6,7 +6,6 @@ exports.getAllExtensions = getAllExtensions;
 const language_core_1 = require("@volar/language-core");
 const CompilerDOM = require("@vue/compiler-dom");
 const plugins_1 = require("./plugins");
-const CompilerVue2 = require("./utils/vue2TemplateCompiler");
 const vueFile_1 = require("./virtualFile/vueFile");
 const fileRegistries = [];
 function getVueFileRegistry(key, plugins) {
@@ -38,12 +37,7 @@ function getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins) {
 function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFileName) {
     const pluginContext = {
         modules: {
-            '@vue/compiler-dom': vueCompilerOptions.target < 3
-                ? {
-                    ...CompilerDOM,
-                    compile: CompilerVue2.compile,
-                }
-                : CompilerDOM,
+            '@vue/compiler-dom': CompilerDOM,
             typescript: ts,
         },
         compilerOptions,
@@ -109,17 +103,12 @@ function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFile
     };
 }
 function getAllExtensions(options) {
-    const result = new Set();
-    for (const key in options) {
-        if (key === 'extensions' || key.endsWith('Extensions')) {
-            const value = options[key];
-            if (Array.isArray(value) && value.every(v => typeof v === 'string')) {
-                for (const ext of value) {
-                    result.add(ext);
-                }
-            }
-        }
-    }
-    return [...result];
+    return [
+        ...new Set([
+            'extensions',
+            'vitePressExtensions',
+            'petiteVueExtensions',
+        ].flatMap(key => options[key])),
+    ];
 }
 //# sourceMappingURL=languagePlugin.js.map

package/lib/parsers/scriptRanges.d.ts

@@ -13,7 +13,6 @@ export declare function parseScriptRanges(ts: typeof import('typescript'), ast:
         nameOption: TextRange | undefined;
         inheritAttrsOption: string | undefined;
     }) | undefined;
-    classBlockEnd: number | undefined;
     bindings: {
         range: TextRange;
         moduleName?: string;

package/lib/parsers/scriptRanges.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptRanges = parseScriptRanges;
 const shared_1 = require("../utils/shared");
-const scriptSetupRanges_1 = require("./scriptSetupRanges");
+const utils_1 = require("./utils");
 function parseScriptRanges(ts, ast, hasScriptSetup) {
     let exportDefault;
-    let classBlockEnd;
-    const bindings = hasScriptSetup ? (0, scriptSetupRanges_1.parseBindingRanges)(ts, ast) : [];
+    const bindings = hasScriptSetup ? (0, utils_1.parseBindingRanges)(ts, ast) : [];
     ts.forEachChild(ast, raw => {
         if (ts.isExportAssignment(raw)) {
             let node = raw;
@@ -56,17 +55,15 @@ function parseScriptRanges(ts, ast, hasScriptSetup) {
                     nameOption: nameOptionNode ? _getStartEnd(nameOptionNode) : undefined,
                     inheritAttrsOption,
                 };
+                const comment = (0, utils_1.getClosestMultiLineCommentRange)(ts, raw, [], ast);
+                if (comment) {
+                    exportDefault.start = comment.start;
+                }
             }
         }
-        if (ts.isClassDeclaration(raw)
-            && raw.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)
-            && raw.modifiers.some(mod => mod.kind === ts.SyntaxKind.DefaultKeyword)) {
-            classBlockEnd = raw.end - 1;
-        }
     });
     return {
         exportDefault,
-        classBlockEnd,
         bindings,
     };
     function _getStartEnd(node) {

package/lib/parsers/scriptSetupRanges.d.ts

@@ -66,10 +66,4 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript'),
     useSlots: CallExpressionRange[];
     useTemplateRef: UseTemplateRef[];
 };
-export declare function parseBindingRanges(ts: typeof import('typescript'), ast: ts.SourceFile): {
-    range: TextRange;
-    moduleName?: string;
-    isDefaultImport?: boolean;
-    isNamespace?: boolean;
-}[];
 export {};

package/lib/parsers/scriptSetupRanges.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptSetupRanges = parseScriptSetupRanges;
-exports.parseBindingRanges = parseBindingRanges;
 const collectBindings_1 = require("../utils/collectBindings");
 const shared_1 = require("../utils/shared");
-const tsCheckReg = /^\/\/\s*@ts-(?:no)?check($|\s)/;
+const utils_1 = require("./utils");
+const tsCheckReg = /^\/\/\s*@ts-(?:no)?check(?:$|\s)/;
 function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const defineModel = [];
     let defineProps;
@@ -20,7 +20,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const text = ast.text;
     const leadingCommentRanges = ts.getLeadingCommentRanges(text, 0)?.reverse() ?? [];
     const leadingCommentEndOffset = leadingCommentRanges.find(range => tsCheckReg.test(text.slice(range.pos, range.end)))?.end ?? 0;
-    let bindings = parseBindingRanges(ts, ast);
+    let bindings = (0, utils_1.parseBindingRanges)(ts, ast);
     let foundNonImportExportNode = false;
     let importSectionEndOffset = 0;
     ts.forEachChild(ast, node => {
@@ -134,7 +134,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     runtimeType,
                     defaultValue,
                     required,
-                    comments: getClosestMultiLineCommentRange(ts, node, parents, ast),
+                    comments: (0, utils_1.getClosestMultiLineCommentRange)(ts, node, parents, ast),
                     argNode: options,
                 });
             }
@@ -250,7 +250,9 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     }
     function parseCallExpressionAssignment(node, parent) {
         return {
-            name: ts.isVariableDeclaration(parent) ? _getNodeText(parent.name) : undefined,
+            name: ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)
+                ? _getNodeText(parent.name)
+                : undefined,
             ...parseCallExpression(node),
         };
     }
@@ -261,77 +263,6 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         return (0, shared_1.getNodeText)(ts, node, ast);
     }
 }
-function parseBindingRanges(ts, ast) {
-    const bindings = [];
-    ts.forEachChild(ast, node => {
-        if (ts.isVariableStatement(node)) {
-            for (const decl of node.declarationList.declarations) {
-                const ranges = (0, collectBindings_1.collectBindingRanges)(ts, decl.name, ast);
-                bindings.push(...ranges.map(range => ({ range })));
-            }
-        }
-        else if (ts.isFunctionDeclaration(node)) {
-            if (node.name && ts.isIdentifier(node.name)) {
-                bindings.push({
-                    range: _getStartEnd(node.name),
-                });
-            }
-        }
-        else if (ts.isClassDeclaration(node)) {
-            if (node.name) {
-                bindings.push({
-                    range: _getStartEnd(node.name),
-                });
-            }
-        }
-        else if (ts.isEnumDeclaration(node)) {
-            bindings.push({
-                range: _getStartEnd(node.name),
-            });
-        }
-        if (ts.isImportDeclaration(node)) {
-            const moduleName = _getNodeText(node.moduleSpecifier).slice(1, -1);
-            if (node.importClause && !node.importClause.isTypeOnly) {
-                const { name, namedBindings } = node.importClause;
-                if (name) {
-                    bindings.push({
-                        range: _getStartEnd(name),
-                        moduleName,
-                        isDefaultImport: true,
-                    });
-                }
-                if (namedBindings) {
-                    if (ts.isNamedImports(namedBindings)) {
-                        for (const element of namedBindings.elements) {
-                            if (element.isTypeOnly) {
-                                continue;
-                            }
-                            bindings.push({
-                                range: _getStartEnd(element.name),
-                                moduleName,
-                                isDefaultImport: element.propertyName?.text === 'default',
-                            });
-                        }
-                    }
-                    else {
-                        bindings.push({
-                            range: _getStartEnd(namedBindings.name),
-                            moduleName,
-                            isNamespace: true,
-                        });
-                    }
-                }
-            }
-        }
-    });
-    return bindings;
-    function _getStartEnd(node) {
-        return (0, shared_1.getStartEnd)(ts, node, ast);
-    }
-    function _getNodeText(node) {
-        return (0, shared_1.getNodeText)(ts, node, ast);
-    }
-}
 function getStatementRange(ts, parents, node, ast) {
     let statementRange;
     for (let i = parents.length - 1; i >= 0; i--) {
@@ -350,21 +281,4 @@ function getStatementRange(ts, parents, node, ast) {
     }
     return statementRange;
 }
-function getClosestMultiLineCommentRange(ts, node, parents, ast) {
-    for (let i = parents.length - 1; i >= 0; i--) {
-        if (ts.isStatement(node)) {
-            break;
-        }
-        node = parents[i];
-    }
-    const comment = ts.getLeadingCommentRanges(ast.text, node.pos)
-        ?.reverse()
-        .find(range => range.kind === 3);
-    if (comment) {
-        return {
-            start: comment.pos,
-            end: comment.end,
-        };
-    }
-}
 //# sourceMappingURL=scriptSetupRanges.js.map

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

@@ -12,7 +12,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
             nameOption: import("../types").TextRange | undefined;
             inheritAttrsOption: string | undefined;
         }) | undefined;
-        classBlockEnd: number | undefined;
         bindings: {
             range: import("../types").TextRange;
             moduleName?: string;
@@ -124,11 +123,9 @@ export declare const tsCodegen: WeakMap<Sfc, {
         bypassDefineComponent: boolean;
         bindingNames: Set<string>;
         localTypes: {
-            generate: (names: string[]) => Generator<string, void, unknown>;
-            getUsedNames(): Set<string>;
+            generate: () => Generator<string, void, unknown>;
             readonly PrettifyLocal: string;
-            readonly OmitKeepDiscriminatedUnion: string;
-            readonly WithDefaults: string;
+            readonly WithDefaultsLocal: string;
             readonly WithSlots: string;
             readonly PropsChildren: string;
             readonly TypePropsToOption: string;

package/lib/plugins/vue-tsx.js

@@ -118,25 +118,30 @@ function createTsx(fileName, sfc, ctx) {
         return newNames;
     });
     const setupHasDefineSlots = (0, alien_signals_1.computed)(() => !!getScriptSetupRanges()?.defineSlots);
-    const getSetupSlotsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineSlots?.name);
     const getSetupPropsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineProps?.name);
+    const getSetupSlotsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineSlots?.name);
     const getSetupInheritAttrs = (0, alien_signals_1.computed)(() => {
         const value = getScriptSetupRanges()?.defineOptions?.inheritAttrs
             ?? getScriptRanges()?.exportDefault?.inheritAttrsOption;
         return value !== 'false';
     });
     const getComponentSelfName = (0, alien_signals_1.computed)(() => {
+        let name;
         const { exportDefault } = getScriptRanges() ?? {};
         if (sfc.script && exportDefault?.nameOption) {
-            const { nameOption } = exportDefault;
-            return sfc.script.content.slice(nameOption.start + 1, nameOption.end - 1);
+            name = sfc.script.content.slice(exportDefault.nameOption.start + 1, exportDefault.nameOption.end - 1);
         }
-        const { defineOptions } = getScriptSetupRanges() ?? {};
-        if (sfc.scriptSetup && defineOptions?.name) {
-            return defineOptions.name;
+        else {
+            const { defineOptions } = getScriptSetupRanges() ?? {};
+            if (sfc.scriptSetup && defineOptions?.name) {
+                name = defineOptions.name;
+            }
+            else {
+                const baseName = path.basename(fileName);
+                name = baseName.slice(0, baseName.lastIndexOf('.'));
+            }
         }
-        const baseName = path.basename(fileName);
-        return (0, shared_1.capitalize)((0, shared_1.camelize)(baseName.slice(0, baseName.lastIndexOf('.'))));
+        return (0, shared_1.capitalize)((0, shared_1.camelize)(name));
     });
     const getGeneratedTemplate = (0, alien_signals_1.computed)(() => {
         if (getResolvedOptions().skipTemplateCodegen || !sfc.template) {
@@ -152,8 +157,8 @@ function createTsx(fileName, sfc, ctx) {
             destructuredPropNames: getSetupDestructuredPropNames(),
             templateRefNames: getSetupTemplateRefNames(),
             hasDefineSlots: setupHasDefineSlots(),
-            slotsAssignName: getSetupSlotsAssignName(),
             propsAssignName: getSetupPropsAssignName(),
+            slotsAssignName: getSetupSlotsAssignName(),
             inheritAttrs: getSetupInheritAttrs(),
             selfComponentName: getComponentSelfName(),
         });
@@ -163,7 +168,7 @@ function createTsx(fileName, sfc, ctx) {
             ts,
             compilerOptions: ctx.compilerOptions,
             vueCompilerOptions: getResolvedOptions(),
-            sfc: sfc,
+            sfc,
             fileName,
             lang: getLang(),
             scriptRanges: getScriptRanges(),

package/lib/types.d.ts

@@ -8,7 +8,7 @@ export type { SFCParseResult } from '@vue/compiler-sfc';
 export { VueEmbeddedCode };
 export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'globalTypesPath' | 'plugins'>> & {
     strictTemplates?: boolean;
-    target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
+    target?: 'auto' | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
     globalTypesPath?: string;
     plugins?: string[];
 };

package/lib/utils/shared.d.ts

@@ -3,7 +3,6 @@ import type * as ts from 'typescript';
 import type { Sfc, TextRange } from '../types';
 export { hyphenate as hyphenateTag } from '@vue/shared';
 export declare function hyphenateAttr(str: string): string;
-export declare function getSlotsPropertyName(vueVersion: number): "$scopedSlots" | "$slots";
 export declare function getElementTagOffsets(node: CompilerDOM.ElementNode, template: NonNullable<Sfc['template']>): [number] | [number, number];
 export declare function getStartEnd(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): TextRange;
 export declare function getNodeText(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): string;

package/lib/utils/shared.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hyphenateTag = void 0;
 exports.hyphenateAttr = hyphenateAttr;
-exports.getSlotsPropertyName = getSlotsPropertyName;
 exports.getElementTagOffsets = getElementTagOffsets;
 exports.getStartEnd = getStartEnd;
 exports.getNodeText = getNodeText;
@@ -17,9 +16,6 @@ function hyphenateAttr(str) {
     }
     return hyphencase;
 }
-function getSlotsPropertyName(vueVersion) {
-    return vueVersion < 3 ? '$scopedSlots' : '$slots';
-}
 function getElementTagOffsets(node, template) {
     const tagOffsets = [
         template.content.indexOf(node.tag, node.loc.start.offset),

package/lib/virtualFile/vueFile.d.ts

@@ -1,6 +1,7 @@
-import type { VirtualCode } from '@volar/language-core';
+import type { CodeInformation, Mapping, VirtualCode } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { VueCompilerOptions, VueLanguagePluginReturn } from '../types';
+import { computedSfc } from './computedSfc';
 export declare class VueVirtualCode implements VirtualCode {
     fileName: string;
     languageId: string;
@@ -8,22 +9,16 @@ export declare class VueVirtualCode implements VirtualCode {
     vueCompilerOptions: VueCompilerOptions;
     plugins: VueLanguagePluginReturn[];
     ts: typeof import('typescript');
-    id: string;
+    readonly id = "main";
+    readonly sfc: ReturnType<typeof computedSfc>;
     private _snapshot;
     private _vueSfc;
-    private _sfc;
     private _embeddedCodes;
     private _mappings;
     get snapshot(): ts.IScriptSnapshot;
     get vueSfc(): import("@vue/compiler-sfc").SFCParseResult | undefined;
-    get sfc(): import("../types").Sfc;
     get embeddedCodes(): VirtualCode[];
-    get mappings(): {
-        sourceOffsets: number[];
-        generatedOffsets: number[];
-        lengths: number[];
-        data: import("@volar/language-core").CodeInformation;
-    }[];
+    get mappings(): Mapping<CodeInformation>[];
     constructor(fileName: string, languageId: string, initSnapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: VueLanguagePluginReturn[], ts: typeof import('typescript'));
     update(newSnapshot: ts.IScriptSnapshot): void;
 }

package/lib/virtualFile/vueFile.js

@@ -7,16 +7,12 @@ const computedEmbeddedCodes_1 = require("./computedEmbeddedCodes");
 const computedSfc_1 = require("./computedSfc");
 const computedVueSfc_1 = require("./computedVueSfc");
 class VueVirtualCode {
-    // others
     get snapshot() {
         return this._snapshot();
     }
     get vueSfc() {
         return this._vueSfc();
     }
-    get sfc() {
-        return this._sfc;
-    }
     get embeddedCodes() {
         return this._embeddedCodes();
     }
@@ -30,13 +26,11 @@ class VueVirtualCode {
         this.vueCompilerOptions = vueCompilerOptions;
         this.plugins = plugins;
         this.ts = ts;
-        // sources
         this.id = 'main';
-        this._snapshot = (0, alien_signals_1.signal)(undefined);
-        // computeds
+        this._snapshot = (0, alien_signals_1.signal)(initSnapshot);
         this._vueSfc = (0, computedVueSfc_1.computedVueSfc)(this.plugins, this.fileName, this.languageId, this._snapshot);
-        this._sfc = (0, computedSfc_1.computedSfc)(this.ts, this.plugins, this.fileName, this._snapshot, this._vueSfc);
-        this._embeddedCodes = (0, computedEmbeddedCodes_1.computedEmbeddedCodes)(this.plugins, this.fileName, this._sfc);
+        this.sfc = (0, computedSfc_1.computedSfc)(this.ts, this.plugins, this.fileName, this._snapshot, this._vueSfc);
+        this._embeddedCodes = (0, computedEmbeddedCodes_1.computedEmbeddedCodes)(this.plugins, this.fileName, this.sfc);
         this._mappings = (0, alien_signals_1.computed)(() => {
             const snapshot = this._snapshot();
             return [{
@@ -46,7 +40,6 @@ class VueVirtualCode {
                     data: plugins_1.allCodeFeatures,
                 }];
         });
-        this._snapshot(initSnapshot);
     }
     update(newSnapshot) {
         this._snapshot(newSnapshot);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.7",
+	"version": "3.1.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,7 +15,6 @@
 	"dependencies": {
 		"@volar/language-core": "2.4.23",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
 		"alien-signals": "^2.0.5",
 		"muggle-string": "^0.4.1",
@@ -37,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "6022b75534487f8a031dfc61a7879f900b64d414"
+	"gitHead": "adcbd8b1a7bf432844230755de999d22b95dc160"
 }

package/lib/utils/ts.d.ts

@@ -1,24 +0,0 @@
-import type * as ts from 'typescript';
-import type { RawVueCompilerOptions, VueCompilerOptions, VueLanguagePlugin } from '../types';
-interface ParseConfigHost extends Omit<ts.ParseConfigHost, 'readDirectory'> {
-}
-export interface ParsedCommandLine extends Omit<ts.ParsedCommandLine, 'fileNames'> {
-    vueOptions: VueCompilerOptions;
-}
-export declare function createParsedCommandLineByJson(ts: typeof import('typescript'), host: ParseConfigHost, rootDir: string, json: any, configFileName?: string): ParsedCommandLine;
-export declare function createParsedCommandLine(ts: typeof import('typescript'), host: ParseConfigHost, configFileName: string): ParsedCommandLine;
-export declare class CompilerOptionsResolver {
-    fileExists?: ((path: string) => boolean) | undefined;
-    configRoots: Set<string>;
-    options: Omit<RawVueCompilerOptions, 'target' | 'globalTypesPath' | 'plugins'>;
-    target: number | undefined;
-    globalTypesPath: string | undefined;
-    plugins: VueLanguagePlugin[];
-    constructor(fileExists?: ((path: string) => boolean) | undefined);
-    addConfig(options: RawVueCompilerOptions, rootDir: string): void;
-    build(defaults?: VueCompilerOptions): VueCompilerOptions;
-    private findNodeModulesRoot;
-}
-export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean): VueCompilerOptions;
-export declare function writeGlobalTypes(vueOptions: VueCompilerOptions, writeFile: (fileName: string, data: string) => void): void;
-export {};