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

package/lib/codegen/globalTypes.js

@@ -2,6 +2,7 @@
 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,
@@ -61,7 +62,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
 		__ctx?: {
 			attrs?: any,
-			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>,
+			slots?: T extends { ${(0, shared_1.getSlotsPropertyName)(target)}: infer Slots } ? Slots : Record<string, any>,
 			emit?: T extends { $emit: infer Emit } ? Emit : {},
 			props?: ${fnPropsType},
 			expose?: (exposed: T) => void,
@@ -151,7 +152,9 @@ 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>
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>${target === 2.7
+        ? `: T extends import('${lib}').AsyncComponent ? (props: {}, ctx?: any) => any`
+        : ``}
 		: 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,6 +1,7 @@
 "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();
@@ -20,7 +21,7 @@ type __VLS_WithDefaults<P, D> = {
     const WithSlots = defineHelper(`__VLS_WithSlots`, () => `
 type __VLS_WithSlots<T, S> = T & {
 	new(): {
-		$slots: S;
+		${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: 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 } = options.scriptRanges;
+        const { exportDefault, classBlockEnd } = options.scriptRanges;
         const isExportRawObject = exportDefault
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
@@ -77,6 +77,19 @@ 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

@@ -341,9 +341,11 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `})${utils_1.endOfLine}`;
         yield `type __VLS_BuiltInPublicProps = ${options.vueCompilerOptions.target >= 3.4
             ? `import('${options.vueCompilerOptions.lib}').PublicProps`
-            : `import('${options.vueCompilerOptions.lib}').VNodeProps`
-                + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
-                + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`}`;
+            : options.vueCompilerOptions.target >= 3
+                ? `import('${options.vueCompilerOptions.lib}').VNodeProps`
+                    + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
+                    + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`
+                : `globalThis.JSX.IntrinsicAttributes`}`;
         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

@@ -101,7 +101,9 @@ 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 () => { $slots: __VLS_Slots }), `;
+            yield `typeof __VLS_self & (new () => { `
+                + (0, shared_2.getSlotsPropertyName)(options.vueCompilerOptions.target)
+                + `: __VLS_Slots }), `;
         }
         else {
             yield `void, `;
@@ -180,7 +182,7 @@ function* generateComponent(options, ctx, node) {
     }
     if (hasVBindAttrs(options, ctx, node)) {
         const attrsVar = ctx.getInternalVariable();
-        yield `let ${attrsVar}!: Parameters<typeof ${componentFunctionalVar}>[0]${utils_1.endOfLine}`;
+        yield `var ${attrsVar}!: Parameters<typeof ${componentFunctionalVar}>[0]${utils_1.endOfLine}`;
         ctx.inheritedAttrVars.add(attrsVar);
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);

package/lib/codegen/template/elementProps.js

@@ -111,7 +111,11 @@ 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))) {
+            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')) {
                 continue;
             }
             const shouldSpread = prop.name === 'style' || prop.name === 'class';
@@ -268,6 +272,6 @@ function getModelPropName(node, vueCompilerOptions) {
             }
         }
     }
-    return 'modelValue';
+    return vueCompilerOptions.target < 3 ? 'value' : 'modelValue';
 }
 //# sourceMappingURL=elementProps.js.map

package/lib/codegen/template/index.js

@@ -3,6 +3,7 @@ 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");
@@ -17,8 +18,9 @@ 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('$slots');
+        ctx.dollarVars.add(slotsPropertyName);
     }
     if (options.vueCompilerOptions.inferTemplateDollarAttrs) {
         ctx.dollarVars.add('$attrs');
@@ -35,7 +37,7 @@ function* generateTemplate(options) {
     yield* (0, styleScopedClasses_1.generateStyleScopedClassReferences)(ctx);
     yield* ctx.generateHoistVariables();
     const speicalTypes = [
-        ['$slots', yield* generateSlots(options, ctx)],
+        [slotsPropertyName, yield* generateSlots(options, ctx)],
         ['$attrs', yield* generateInheritedAttrs(options, ctx)],
         ['$refs', yield* generateTemplateRefs(options, ctx)],
         ['$el', yield* generateRootEl(ctx)],

package/lib/languagePlugin.js

@@ -6,6 +6,7 @@ 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) {
@@ -37,7 +38,12 @@ function getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins) {
 function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFileName) {
     const pluginContext = {
         modules: {
-            '@vue/compiler-dom': CompilerDOM,
+            '@vue/compiler-dom': vueCompilerOptions.target < 3
+                ? {
+                    ...CompilerDOM,
+                    compile: CompilerVue2.compile,
+                }
+                : CompilerDOM,
             typescript: ts,
         },
         compilerOptions,

package/lib/parsers/scriptRanges.d.ts

@@ -13,6 +13,7 @@ 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

@@ -5,6 +5,7 @@ const shared_1 = require("../utils/shared");
 const scriptSetupRanges_1 = require("./scriptSetupRanges");
 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)) {
@@ -57,9 +58,15 @@ function parseScriptRanges(ts, ast, hasScriptSetup) {
                 };
             }
         }
+        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/vue-tsx.d.ts

@@ -11,6 +11,7 @@ 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;

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' | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
+    target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {

package/lib/utils/shared.d.ts

@@ -2,5 +2,6 @@ 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,6 +2,7 @@
 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");
@@ -15,6 +16,9 @@ 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

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

package/lib/utils/vue2TemplateCompiler.d.ts

@@ -0,0 +1,2 @@
+import * as CompilerDOM from '@vue/compiler-dom';
+export declare const compile: typeof CompilerDOM.compile;

package/lib/utils/vue2TemplateCompiler.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compile = void 0;
+const CompilerDOM = require("@vue/compiler-dom");
+const Vue2TemplateCompiler = require('@vue/compiler-vue2/build');
+const compile = (template, options = {}) => {
+    if (typeof template !== 'string') {
+        throw new Error(`[@vue/language-core] compile() first argument must be string.`);
+    }
+    const onError = options.onError;
+    const onWarn = options.onWarn;
+    options.onError = error => {
+        if (error.code === 33 // :key binding allowed in v-for template child in vue 2
+            || error.code === 29 // fix https://github.com/vuejs/language-tools/issues/1638
+        ) {
+            return;
+        }
+        if (onError) {
+            onError(error);
+        }
+        else {
+            throw error;
+        }
+    };
+    const vue2Result = Vue2TemplateCompiler.compile(template, { outputSourceRange: true });
+    for (const error of vue2Result.errors) {
+        onError?.({
+            code: 'vue-template-compiler',
+            name: '',
+            message: error.msg,
+            loc: {
+                source: '',
+                start: { column: -1, line: -1, offset: error.start },
+                end: { column: -1, line: -1, offset: error.end ?? error.start },
+            },
+        });
+    }
+    for (const error of vue2Result.tips) {
+        onWarn?.({
+            code: 'vue-template-compiler',
+            name: '',
+            message: error.msg,
+            loc: {
+                source: '',
+                start: { column: -1, line: -1, offset: error.start },
+                end: { column: -1, line: -1, offset: error.end ?? error.start },
+            },
+        });
+    }
+    return baseCompile(template, Object.assign({}, CompilerDOM.parserOptions, options, {
+        nodeTransforms: [
+            ...CompilerDOM.DOMNodeTransforms,
+            ...(options.nodeTransforms || []),
+        ],
+        directiveTransforms: Object.assign({}, CompilerDOM.DOMDirectiveTransforms, options.directiveTransforms || {}),
+    }));
+};
+exports.compile = compile;
+function baseCompile(template, options = {}) {
+    const onError = options.onError || (error => {
+        throw error;
+    });
+    const isModuleMode = options.mode === 'module';
+    const prefixIdentifiers = options.prefixIdentifiers === true || isModuleMode;
+    if (!prefixIdentifiers && options.cacheHandlers) {
+        onError(CompilerDOM.createCompilerError(49));
+    }
+    if (options.scopeId && !isModuleMode) {
+        onError(CompilerDOM.createCompilerError(50));
+    }
+    const ast = CompilerDOM.baseParse(template, options);
+    const [nodeTransforms, directiveTransforms] = CompilerDOM.getBaseTransformPreset(prefixIdentifiers);
+    // v-for > v-if in vue 2
+    const transformIf = nodeTransforms[1];
+    const transformFor = nodeTransforms[3];
+    nodeTransforms[1] = transformFor;
+    nodeTransforms[3] = transformIf;
+    CompilerDOM.transform(ast, Object.assign({}, options, {
+        prefixIdentifiers,
+        nodeTransforms: [
+            ...nodeTransforms,
+            ...(options.nodeTransforms || []), // user transforms
+        ],
+        directiveTransforms: Object.assign({}, directiveTransforms, options.directiveTransforms || {}),
+    }));
+    return CompilerDOM.generate(ast, Object.assign({}, options, {
+        prefixIdentifiers,
+    }));
+}
+//# sourceMappingURL=vue2TemplateCompiler.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.0-beta.4",
+	"version": "3.0.0-beta.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,6 +15,7 @@
 	"dependencies": {
 		"@volar/language-core": "2.4.15",
 		"@vue/compiler-dom": "^3.5.0",
+		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
 		"alien-signals": "^2.0.5",
 		"minimatch": "^10.0.1",
@@ -35,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "5cb41faacbfe2d9e2d64637c6c1ae8769d9cba3f"
+	"gitHead": "3a4648914c60c90444d939cf762a016a4318ca09"
 }