@vue/language-core 3.0.0-alpha.6 → 3.0.0-alpha.8

package/lib/codegen/globalTypes.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalTypesFileName = getGlobalTypesFileName;
 exports.generateGlobalTypes = generateGlobalTypes;
-const shared_1 = require("../utils/shared");
 function getGlobalTypesFileName({ lib, target, checkUnknownProps, checkUnknownEvents, checkUnknownComponents, }) {
     return [
         lib,
@@ -62,7 +61,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
 		__ctx?: {
 			attrs?: any,
-			slots?: T extends { ${(0, shared_1.getSlotsPropertyName)(target)}: infer Slots } ? Slots : Record<string, any>,
+			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>,
 			emit?: T extends { $emit: infer Emit } ? Emit : {},
 			props?: ${fnPropsType},
 			expose?: (exposed: T) => void,
@@ -150,9 +149,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 		T extends new (...args: any) => any ? __VLS_FunctionalComponent<K>
-		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>${(target === 2.7
-        ? `: T extends import('${lib}').AsyncComponent ? (props: {}, ctx?: any) => any`
-        : ``)}
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 		: T extends (...args: any) => any ? T
 		: __VLS_FunctionalComponent<{}>;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];

package/lib/codegen/localTypes.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalTypesGenerator = getLocalTypesGenerator;
-const shared_1 = require("../utils/shared");
 const utils_1 = require("./utils");
 function getLocalTypesGenerator(vueCompilerOptions) {
     const used = new Set();
@@ -21,7 +20,7 @@ type __VLS_WithDefaults<P, D> = {
     const WithSlots = defineHelper(`__VLS_WithSlots`, () => `
 type __VLS_WithSlots<T, S> = T & {
 	new(): {
-		${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: S;
+		$slots: S;
 		${vueCompilerOptions.jsxSlots ? `$props: ${PropsChildren.name}<S>;` : ''}
 	}
 };

package/lib/codegen/script/index.js

@@ -36,7 +36,7 @@ function* generateScript(options) {
         yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
     }
     if (options.sfc.script && options.scriptRanges) {
-        const { exportDefault, classBlockEnd } = options.scriptRanges;
+        const { exportDefault } = options.scriptRanges;
         const isExportRawObject = exportDefault
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
@@ -77,19 +77,6 @@ function* generateScript(options) {
             yield options.vueCompilerOptions.optionsWrapper[1];
             yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
         }
-        else if (classBlockEnd !== undefined) {
-            if (options.vueCompilerOptions.skipTemplateCodegen) {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-            }
-            else {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, codeFeatures_1.codeFeatures.all);
-                yield `__VLS_template = () => {${utils_1.newLine}`;
-                const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-                yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
-                yield `}${utils_1.endOfLine}`;
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-            }
-        }
         else {
             yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/script.vue');

package/lib/codegen/script/scriptSetup.js

@@ -340,11 +340,9 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `})${utils_1.endOfLine}`;
         yield `type __VLS_BuiltInPublicProps = ${options.vueCompilerOptions.target >= 3.4
             ? `import('${options.vueCompilerOptions.lib}').PublicProps`
-            : options.vueCompilerOptions.target >= 3.0
-                ? `import('${options.vueCompilerOptions.lib}').VNodeProps`
-                    + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
-                    + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`
-                : `globalThis.JSX.IntrinsicAttributes`}`;
+            : `import('${options.vueCompilerOptions.lib}').VNodeProps`
+                + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
+                + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`}`;
         yield utils_1.endOfLine;
         yield `type __VLS_OwnProps = `;
         yield `${ctx.localTypes.OmitKeepDiscriminatedUnion}<InstanceType<typeof __VLS_fnComponent>['$props'], keyof __VLS_BuiltInPublicProps>`;

package/lib/codegen/template/element.js

@@ -103,9 +103,7 @@ function* generateComponent(options, ctx, node) {
     else if (!isComponentTag) {
         yield `const ${componentOriginalVar} = ({} as __VLS_WithComponent<'${getCanonicalComponentName(node.tag)}', __VLS_LocalComponents, `;
         if (options.selfComponentName && possibleOriginalNames.includes(options.selfComponentName)) {
-            yield `typeof __VLS_self & (new () => { `
-                + (0, shared_2.getSlotsPropertyName)(options.vueCompilerOptions.target)
-                + `: __VLS_Slots }), `;
+            yield `typeof __VLS_self & (new () => { $slots: __VLS_Slots }), `;
         }
         else {
             yield `void, `;

package/lib/codegen/template/elementProps.js

@@ -111,11 +111,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
         }
         else if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE) {
-            if (options.vueCompilerOptions.dataAttributes.some(pattern => (0, minimatch_1.minimatch)(prop.name, pattern))
-                // Vue 2 Transition doesn't support "persisted" property but `@vue/compiler-dom` always adds it (#3881)
-                || (options.vueCompilerOptions.target < 3
-                    && prop.name === 'persisted'
-                    && node.tag.toLowerCase() === 'transition')) {
+            if (options.vueCompilerOptions.dataAttributes.some(pattern => (0, minimatch_1.minimatch)(prop.name, pattern))) {
                 continue;
             }
             const shouldSpread = prop.name === 'style' || prop.name === 'class';
@@ -272,6 +268,6 @@ function getModelPropName(node, vueCompilerOptions) {
             }
         }
     }
-    return vueCompilerOptions.target < 3 ? 'value' : 'modelValue';
+    return 'modelValue';
 }
 //# sourceMappingURL=elementProps.js.map

package/lib/codegen/template/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTemplate = generateTemplate;
 exports.forEachElementNode = forEachElementNode;
 const CompilerDOM = require("@vue/compiler-dom");
-const shared_1 = require("../../utils/shared");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
 const context_1 = require("./context");
@@ -18,9 +17,8 @@ function* generateTemplate(options) {
     if (options.propsAssignName) {
         ctx.addLocalVariable(options.propsAssignName);
     }
-    const slotsPropertyName = (0, shared_1.getSlotsPropertyName)(options.vueCompilerOptions.target);
     if (options.vueCompilerOptions.inferTemplateDollarSlots) {
-        ctx.dollarVars.add(slotsPropertyName);
+        ctx.dollarVars.add('$slots');
     }
     if (options.vueCompilerOptions.inferTemplateDollarAttrs) {
         ctx.dollarVars.add('$attrs');
@@ -37,7 +35,7 @@ function* generateTemplate(options) {
     yield* (0, styleScopedClasses_1.generateStyleScopedClassReferences)(ctx);
     yield* ctx.generateHoistVariables();
     const speicalTypes = [
-        [slotsPropertyName, yield* generateSlots(options, ctx)],
+        ['$slots', yield* generateSlots(options, ctx)],
         ['$attrs', yield* generateInheritedAttrs(options, ctx)],
         ['$refs', yield* generateTemplateRefs(options, ctx)],
         ['$el', yield* generateRootEl(ctx)]

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,

package/lib/parsers/scriptRanges.d.ts

@@ -2,18 +2,17 @@ import type * as ts from 'typescript';
 import type { TextRange } from '../types';
 export interface ScriptRanges extends ReturnType<typeof parseScriptRanges> {
 }
-export declare function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, hasScriptSetup: boolean, withNode: boolean): {
+export declare function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, hasScriptSetup: boolean): {
     exportDefault: (TextRange & {
         expression: TextRange;
         args: TextRange;
-        argsNode: ts.ObjectLiteralExpression | undefined;
+        argsNode: ts.ObjectLiteralExpression;
         componentsOption: TextRange | undefined;
         componentsOptionNode: ts.ObjectLiteralExpression | undefined;
         directivesOption: TextRange | undefined;
         nameOption: TextRange | undefined;
         inheritAttrsOption: string | undefined;
     }) | undefined;
-    classBlockEnd: number | undefined;
     bindings: {
         range: TextRange;
         moduleName?: string;

package/lib/parsers/scriptRanges.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptRanges = parseScriptRanges;
 const shared_1 = require("../utils/shared");
 const scriptSetupRanges_1 = require("./scriptSetupRanges");
-function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
+function parseScriptRanges(ts, ast, hasScriptSetup) {
     let exportDefault;
-    let classBlockEnd;
     const bindings = hasScriptSetup ? (0, scriptSetupRanges_1.parseBindingRanges)(ts, ast) : [];
     ts.forEachChild(ast, raw => {
         if (ts.isExportAssignment(raw)) {
@@ -49,24 +48,18 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
                     ..._getStartEnd(raw),
                     expression: _getStartEnd(node.expression),
                     args: _getStartEnd(obj),
-                    argsNode: withNode ? obj : undefined,
+                    argsNode: obj,
                     componentsOption: componentsOptionNode ? _getStartEnd(componentsOptionNode) : undefined,
-                    componentsOptionNode: withNode ? componentsOptionNode : undefined,
+                    componentsOptionNode,
                     directivesOption: directivesOptionNode ? _getStartEnd(directivesOptionNode) : undefined,
                     nameOption: nameOptionNode ? _getStartEnd(nameOptionNode) : undefined,
                     inheritAttrsOption,
                 };
             }
         }
-        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/plugins/file-md.js

@@ -4,6 +4,7 @@ const language_core_1 = require("@volar/language-core");
 const muggle_string_1 = require("muggle-string");
 const buildMappings_1 = require("../utils/buildMappings");
 const parseSfc_1 = require("../utils/parseSfc");
+const frontmatterReg = /^---[\s\S]*?\n---(?:\r?\n|$)/;
 const codeblockReg = /(`{3,})[\s\S]+?\1/g;
 const inlineCodeblockReg = /`[^\n`]+?`/g;
 const latexBlockReg = /(\${2,})[\s\S]+?\1/g;
@@ -28,6 +29,8 @@ const plugin = ({ vueCompilerOptions }) => {
                 return;
             }
             content = content
+                // frontmatter
+                .replace(frontmatterReg, match => ' '.repeat(match.length))
                 // code block
                 .replace(codeblockReg, (match, quotes) => quotes + ' '.repeat(match.length - quotes.length * 2) + quotes)
                 // inline code block

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

@@ -4,14 +4,13 @@ export declare const tsCodegen: WeakMap<Sfc, {
         exportDefault: (import("../types").TextRange & {
             expression: import("../types").TextRange;
             args: import("../types").TextRange;
-            argsNode: import("typescript").ObjectLiteralExpression | undefined;
+            argsNode: import("typescript").ObjectLiteralExpression;
             componentsOption: import("../types").TextRange | undefined;
             componentsOptionNode: import("typescript").ObjectLiteralExpression | undefined;
             directivesOption: import("../types").TextRange | undefined;
             nameOption: import("../types").TextRange | undefined;
             inheritAttrsOption: string | undefined;
         }) | undefined;
-        classBlockEnd: number | undefined;
         bindings: {
             range: import("../types").TextRange;
             moduleName?: string;

package/lib/plugins/vue-tsx.js

@@ -81,7 +81,7 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
         return ctx.vueCompilerOptions;
     });
     const getScriptRanges = (0, alien_signals_1.computed)(() => sfc.script && validLangs.has(sfc.script.lang)
-        ? (0, scriptRanges_1.parseScriptRanges)(ts, sfc.script.ast, !!sfc.scriptSetup, false)
+        ? (0, scriptRanges_1.parseScriptRanges)(ts, sfc.script.ast, !!sfc.scriptSetup)
         : undefined);
     const getScriptSetupRanges = (0, alien_signals_1.computed)(() => sfc.scriptSetup && validLangs.has(sfc.scriptSetup.lang)
         ? (0, scriptSetupRanges_1.parseScriptSetupRanges)(ts, sfc.scriptSetup.ast, getResolvedOptions())

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' | '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;
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {

package/lib/utils/shared.d.ts

@@ -2,6 +2,5 @@ import type * as ts from 'typescript';
 import type { 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 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.getStartEnd = getStartEnd;
 exports.getNodeText = getNodeText;
 const shared_1 = require("@vue/shared");
@@ -16,9 +15,6 @@ function hyphenateAttr(str) {
     }
     return hyphencase;
 }
-function getSlotsPropertyName(vueVersion) {
-    return vueVersion < 3 ? '$scopedSlots' : '$slots';
-}
 function getStartEnd(ts, node, ast) {
     return {
         start: ts.getTokenPosOfNode(node, ast),

package/lib/utils/ts.js

@@ -239,9 +239,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/virtualFile/computedSfc.js

@@ -7,9 +7,9 @@ const parseCssVars_1 = require("../utils/parseCssVars");
 const signals_1 = require("../utils/signals");
 function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     const getUntrackedSnapshot = () => {
-        (0, alien_signals_1.pauseTracking)();
+        const pausedSub = (0, alien_signals_1.setCurrentSub)(undefined);
         const res = getSnapshot();
-        (0, alien_signals_1.resumeTracking)();
+        (0, alien_signals_1.setCurrentSub)(pausedSub);
         return res;
     };
     const getContent = (0, alien_signals_1.computed)(() => {
@@ -127,9 +127,9 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             if (cache?.plugin.updateSFCTemplate) {
                 const change = getUntrackedSnapshot().getChangeRange(cache.snapshot);
                 if (change) {
-                    (0, alien_signals_1.pauseTracking)();
+                    const pausedSub = (0, alien_signals_1.setCurrentSub)(undefined);
                     const templateOffset = base.startTagEnd;
-                    (0, alien_signals_1.resumeTracking)();
+                    (0, alien_signals_1.setCurrentSub)(pausedSub);
                     const newText = getUntrackedSnapshot().getText(change.span.start, change.span.start + change.newLength);
                     const newResult = cache.plugin.updateSFCTemplate(cache.result, {
                         start: change.span.start - templateOffset,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.0-alpha.6",
+	"version": "3.0.0-alpha.8",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,15 +15,13 @@
 	"dependencies": {
 		"@volar/language-core": "~2.4.13",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
-		"alien-signals": "^1.0.3",
-		"minimatch": "^9.0.3",
+		"alien-signals": "^2.0.5",
+		"minimatch": "^10.0.1",
 		"muggle-string": "^0.4.1",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
-		"@types/minimatch": "^5.1.2",
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
 		"@volar/typescript": "~2.4.13",
@@ -37,5 +35,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "a7b5649ab4957cd2228f4bbc9205b2008bff58a2"
+	"gitHead": "d38cb93558fe8015c7ffe9ceacfdd3296e3692f6"
 }

package/lib/plugins/vue-style-css.d.ts

@@ -1,3 +0,0 @@
-import type { VueLanguagePlugin } from '../types';
-declare const plugin: VueLanguagePlugin;
-export default plugin;

package/lib/plugins/vue-style-css.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const css = require("css-tree");
-const plugin = () => {
-    return {
-        version: 2.1,
-        compileSFCStyle(lang, style) {
-            if (lang === 'css' || lang === 'scss' || lang === 'sass' || lang === 'less') {
-                return css.parse(style, {
-                    filename: 'test.' + lang,
-                    positions: true,
-                });
-            }
-        },
-    };
-};
-exports.default = plugin;
-//# sourceMappingURL=vue-style-css.js.map