@vue/language-core 2.2.8 → 3.0.0-alpha.0

package/index.d.ts

@@ -5,9 +5,8 @@ export * from './lib/parsers/scriptSetupRanges';
 export * from './lib/plugins';
 export * from './lib/types';
 export * from './lib/utils/parseSfc';
+export * from './lib/utils/shared';
 export * from './lib/utils/ts';
 export * from './lib/virtualFile/vueFile';
 export { tsCodegen } from './lib/plugins/vue-tsx';
-export * from './lib/utils/shared';
 export * from '@volar/language-core';
-export type * as CompilerDOM from '@vue/compiler-dom';

package/index.js

@@ -22,10 +22,10 @@ __exportStar(require("./lib/parsers/scriptSetupRanges"), exports);
 __exportStar(require("./lib/plugins"), exports);
 __exportStar(require("./lib/types"), exports);
 __exportStar(require("./lib/utils/parseSfc"), exports);
+__exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("./lib/utils/ts"), exports);
 __exportStar(require("./lib/virtualFile/vueFile"), exports);
 var vue_tsx_1 = require("./lib/plugins/vue-tsx");
 Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });
-__exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("@volar/language-core"), exports);
 //# sourceMappingURL=index.js.map

package/lib/codegen/globalTypes.js

@@ -24,7 +24,6 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
     }
     text += `
 ; declare global {
-	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('${lib}').unref;
 	const __VLS_placeholder: any;
@@ -100,9 +99,6 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
 		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 	>>;
-	type __VLS_OmitStringIndex<T> = {
-		[K in keyof T as string extends K ? never : K]: T[K];
-	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
@@ -144,7 +140,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		: (_: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'} } };
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
 	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T${checkUnknownComponents ? '' : ' & Record<string, unknown>'}) => void;
-	function __VLS_asFunctionalSlot<S>(slot: S): (props: NonNullable<S> extends (props: infer P) => any ? P : {}) => void;
+	function __VLS_asFunctionalSlot<S>(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable<S>;
 	function __VLS_tryAsConstant<const T>(t: T): T;
 }
 `;

package/lib/codegen/script/index.d.ts

@@ -9,7 +9,6 @@ export interface ScriptCodegenOptions {
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
     sfc: Sfc;
-    edited: boolean;
     fileName: string;
     lang: string;
     scriptRanges: ScriptRanges | undefined;

package/lib/codegen/script/index.js

@@ -105,9 +105,6 @@ function* generateScript(options) {
         const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
         yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
-    if (options.edited) {
-        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${utils_1.endOfLine}`;
-    }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
     if (options.appendGlobalTypes) {
         yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions);

package/lib/codegen/script/src.js

@@ -23,26 +23,7 @@ function* generateSrc(src) {
     yield `export * from `;
     yield* (0, utils_1.generateSfcBlockAttrValue)(src, text, {
         ...codeFeatures_1.codeFeatures.all,
-        navigation: text === src.text
-            ? true
-            : {
-                shouldRename: () => false,
-                resolveRenameEditText(newName) {
-                    if (newName.endsWith('.jsx') || newName.endsWith('.js')) {
-                        newName = newName.split('.').slice(0, -1).join('.');
-                    }
-                    if (src?.text.endsWith('.d.ts')) {
-                        newName = newName + '.d.ts';
-                    }
-                    else if (src?.text.endsWith('.ts')) {
-                        newName = newName + '.ts';
-                    }
-                    else if (src?.text.endsWith('.tsx')) {
-                        newName = newName + '.tsx';
-                    }
-                    return newName;
-                },
-            },
+        ...text === src.text ? codeFeatures_1.codeFeatures.navigation : codeFeatures_1.codeFeatures.navigationWithoutRename,
     });
     yield utils_1.endOfLine;
     yield `export { default } from '${text}'${utils_1.endOfLine}`;

package/lib/codegen/script/template.js

@@ -15,9 +15,9 @@ function* generateTemplate(options, ctx) {
     ctx.generatedTemplate = true;
     const templateCodegenCtx = (0, context_1.createTemplateCodegenContext)({
         scriptSetupBindingNames: new Set(),
-        edited: options.edited,
     });
     yield* generateTemplateCtx(options);
+    yield* generateTemplateElements();
     yield* generateTemplateComponents(options);
     yield* generateTemplateDirectives(options);
     yield* generateTemplateBody(options, templateCodegenCtx);
@@ -47,6 +47,9 @@ function* generateTemplateCtx(options) {
         yield `}${utils_1.endOfLine}`;
     }
 }
+function* generateTemplateElements() {
+    yield `let __VLS_elements!: __VLS_IntrinsicElements${utils_1.endOfLine}`;
+}
 function* generateTemplateComponents(options) {
     const types = [];
     if (options.sfc.script && options.scriptRanges?.exportDefault?.componentsOption) {

package/lib/codegen/template/context.d.ts

@@ -100,7 +100,7 @@ export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenCont
  * an error/diagnostic was encountered for a region of code covered by a `@vue-expect-error` directive,
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
-export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames' | 'edited'>): {
+export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>): {
     codeFeatures: {
         all: VueCodeInformation;
         none: VueCodeInformation;
@@ -164,6 +164,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     getInternalVariable: () => string;
     getHoistVariable: (originalVar: string) => string;
     generateHoistVariables: () => Generator<string, void, unknown>;
+    generateConditionGuards: () => Generator<string, void, unknown>;
     ignoreError: () => Generator<Code>;
     expectError: (prevNode: CompilerDOM.CommentNode) => Generator<Code>;
     resetDirectiveComments: (endStr: string) => Generator<Code>;

package/lib/codegen/template/context.js

@@ -210,6 +210,11 @@ function createTemplateCodegenContext(options) {
                 yield utils_1.endOfLine;
             }
         },
+        generateConditionGuards: function* () {
+            for (const condition of blockConditions) {
+                yield `if (!${condition}) return${utils_1.endOfLine}`;
+            }
+        },
         ignoreError: function* () {
             if (!ignoredError) {
                 ignoredError = true;
@@ -246,9 +251,6 @@ function createTemplateCodegenContext(options) {
             }
         },
         generateAutoImportCompletion: function* () {
-            if (!options.edited) {
-                return;
-            }
             const all = [...accessExternalVariables.entries()];
             if (!all.some(([_, offsets]) => offsets.size)) {
                 return;

package/lib/codegen/template/element.js

@@ -5,6 +5,7 @@ exports.generateElement = generateElement;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("@vue/shared");
 const shared_2 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
@@ -82,13 +83,7 @@ function* generateComponent(options, ctx, node, isVForChild) {
             }
             else {
                 const shouldCapitalize = matchImportName[0].toUpperCase() === matchImportName[0];
-                yield* (0, camelized_1.generateCamelized)(shouldCapitalize ? (0, shared_1.capitalize)(node.tag) : node.tag, 'template', tagOffset, {
-                    ...ctx.codeFeatures.withoutHighlightAndCompletion,
-                    navigation: {
-                        resolveRenameNewName: camelizeComponentName,
-                        resolveRenameEditText: getTagRenameApply(node.tag),
-                    },
-                });
+                yield* (0, camelized_1.generateCamelized)(shouldCapitalize ? (0, shared_1.capitalize)(node.tag) : node.tag, 'template', tagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
             }
             yield `, `;
         }
@@ -125,29 +120,21 @@ function* generateComponent(options, ctx, node, isVForChild) {
             yield `/** @type {[`;
             for (const tagOffset of tagOffsets) {
                 for (const shouldCapitalize of (node.tag[0] === node.tag[0].toUpperCase() ? [false] : [true, false])) {
-                    const expectName = shouldCapitalize ? (0, shared_1.capitalize)(camelizedTag) : camelizedTag;
                     yield `typeof __VLS_components.`;
-                    yield* (0, camelized_1.generateCamelized)(shouldCapitalize ? (0, shared_1.capitalize)(node.tag) : node.tag, 'template', tagOffset, {
-                        navigation: {
-                            resolveRenameNewName: node.tag !== expectName ? camelizeComponentName : undefined,
-                            resolveRenameEditText: getTagRenameApply(node.tag),
-                        },
-                    });
+                    yield* (0, camelized_1.generateCamelized)(shouldCapitalize ? (0, shared_1.capitalize)(node.tag) : node.tag, 'template', tagOffset, codeFeatures_1.codeFeatures.navigation);
                     yield `, `;
                 }
             }
             yield `]} */${utils_1.endOfLine}`;
             // auto import support
-            if (options.edited) {
-                yield `// @ts-ignore${utils_1.newLine}`; // #2304
-                yield* (0, camelized_1.generateCamelized)((0, shared_1.capitalize)(node.tag), 'template', tagOffsets[0], {
-                    completion: {
-                        isAdditional: true,
-                        onlyImport: true,
-                    },
-                });
-                yield `${utils_1.endOfLine}`;
-            }
+            yield `// @ts-ignore${utils_1.newLine}`; // #2304
+            yield* (0, camelized_1.generateCamelized)((0, shared_1.capitalize)(node.tag), 'template', tagOffsets[0], {
+                completion: {
+                    isAdditional: true,
+                    onlyImport: true,
+                },
+            });
+            yield `${utils_1.endOfLine}`;
         }
     }
     else {
@@ -220,10 +207,10 @@ function* generateElement(options, ctx, node, isVForChild) {
         ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
         : undefined;
     const failedPropExps = [];
-    yield `__VLS_asFunctionalElement(__VLS_intrinsicElements`;
+    yield `__VLS_asFunctionalElement(__VLS_elements`;
     yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {
-        yield `, __VLS_intrinsicElements`;
+        yield `, __VLS_elements`;
         yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     }
     yield `)(`;
@@ -246,7 +233,7 @@ function* generateElement(options, ctx, node, isVForChild) {
         ctx.singleRootElTypes.push(`__VLS_NativeElements['${node.tag}']`);
     }
     if (hasVBindAttrs(options, ctx, node)) {
-        ctx.inheritedAttrVars.add(`__VLS_intrinsicElements.${node.tag}`);
+        ctx.inheritedAttrVars.add(`__VLS_elements.${node.tag}`);
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
     yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
@@ -319,10 +306,4 @@ function hasVBindAttrs(options, ctx, node) {
             && prop.name === 'bind'
             && prop.exp?.loc.source === '$attrs'));
 }
-function camelizeComponentName(newName) {
-    return (0, shared_1.camelize)('-' + newName);
-}
-function getTagRenameApply(oldName) {
-    return oldName === (0, shared_2.hyphenateTag)(oldName) ? shared_2.hyphenateTag : undefined;
-}
 //# sourceMappingURL=element.js.map

package/lib/codegen/template/elementDirectives.js

@@ -4,7 +4,6 @@ exports.generateElementDirectives = generateElementDirectives;
 exports.generateModifiers = generateModifiers;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("@vue/shared");
-const shared_2 = require("../../utils/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
@@ -44,10 +43,6 @@ function* generateIdentifier(options, ctx, prop) {
         // fix https://github.com/vuejs/language-tools/issues/1905
         ...codeFeatures_1.codeFeatures.additionalCompletion,
         verification: options.vueCompilerOptions.checkUnknownDirectives && !builtInDirectives.has(prop.name),
-        navigation: {
-            resolveRenameNewName: shared_1.camelize,
-            resolveRenameEditText: getPropRenameApply(prop.name),
-        },
     })));
 }
 function* generateArg(options, ctx, prop) {
@@ -90,7 +85,4 @@ function* generateValue(options, ctx, prop) {
     yield `: `;
     yield* (0, elementProps_1.generatePropExp)(options, ctx, prop, exp, ctx.codeFeatures.all);
 }
-function getPropRenameApply(oldName) {
-    return oldName === (0, shared_2.hyphenateAttr)(oldName) ? shared_2.hyphenateAttr : undefined;
-}
 //# sourceMappingURL=elementDirectives.js.map

package/lib/codegen/template/elementEvents.d.ts

@@ -6,4 +6,5 @@ import type { TemplateCodegenOptions } from './index';
 export declare function generateElementEvents(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, componentFunctionalVar: string, componentVNodeVar: string, componentCtxVar: string): Generator<Code>;
 export declare function generateEventArg(ctx: TemplateCodegenContext, name: string, start: number, directive?: string): Generator<Code>;
 export declare function generateEventExpression(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, prop: CompilerDOM.DirectiveNode): Generator<Code>;
+export declare function generateModelEventExpression(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, prop: CompilerDOM.DirectiveNode): Generator<Code>;
 export declare function isCompoundExpression(ts: typeof import('typescript'), ast: ts.SourceFile): boolean;

package/lib/codegen/template/elementEvents.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateElementEvents = generateElementEvents;
 exports.generateEventArg = generateEventArg;
 exports.generateEventExpression = generateEventExpression;
+exports.generateModelEventExpression = generateModelEventExpression;
 exports.isCompoundExpression = isCompoundExpression;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("@vue/shared");
@@ -16,9 +17,11 @@ function* generateElementEvents(options, ctx, node, componentFunctionalVar, comp
     let propsVar;
     for (const prop of node.props) {
         if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-            && prop.name === 'on'
-            && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
-            && prop.arg.isStatic) {
+            && (prop.name === 'on'
+                && (prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic)
+                || options.vueCompilerOptions.strictVModel
+                    && prop.name === 'model'
+                    && (!prop.arg || prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic))) {
             ctx.currentComponent.used = true;
             if (!emitVar) {
                 emitVar = ctx.getInternalVariable();
@@ -28,21 +31,31 @@ function* generateElementEvents(options, ctx, node, componentFunctionalVar, comp
                 yield `let ${eventsVar}!: __VLS_NormalizeEmits<typeof ${emitVar}>${utils_1.endOfLine}`;
                 yield `let ${propsVar}!: __VLS_FunctionalComponentProps<typeof ${componentFunctionalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
             }
-            let source = prop.arg.loc.source;
-            let start = prop.arg.loc.start.offset;
-            let propPrefix = 'on';
+            let source = prop.arg?.loc.source ?? 'model-value';
+            let start = prop.arg?.loc.start.offset;
+            let propPrefix = 'on-';
             let emitPrefix = '';
-            if (source.startsWith('vue:')) {
+            if (prop.name === 'model') {
+                propPrefix = 'onUpdate:';
+                emitPrefix = 'update:';
+            }
+            else if (source.startsWith('vue:')) {
                 source = source.slice('vue:'.length);
                 start = start + 'vue:'.length;
-                propPrefix = 'onVnode';
+                propPrefix = 'onVnode-';
                 emitPrefix = 'vnode-';
             }
-            yield `const ${ctx.getInternalVariable()}: __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${eventsVar}, '${(0, shared_1.camelize)(propPrefix + '-' + source)}', '${emitPrefix}${source}', '${(0, shared_1.camelize)(emitPrefix + source)}'> = {${utils_1.newLine}`;
-            yield* generateEventArg(ctx, source, start, propPrefix);
-            yield `: `;
-            yield* generateEventExpression(options, ctx, prop);
-            yield `}${utils_1.endOfLine}`;
+            yield `(): __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${eventsVar}, '${(0, shared_1.camelize)(propPrefix + source)}', '${emitPrefix + source}', '${(0, shared_1.camelize)(emitPrefix + source)}'> => ({${utils_1.newLine}`;
+            if (prop.name === 'on') {
+                yield* generateEventArg(ctx, source, start, propPrefix.slice(0, -1));
+                yield `: `;
+                yield* generateEventExpression(options, ctx, prop);
+            }
+            else {
+                yield `'${(0, shared_1.camelize)(propPrefix + source)}': `;
+                yield* generateModelEventExpression(options, ctx, prop);
+            }
+            yield `})${utils_1.endOfLine}`;
         }
     }
 }
@@ -70,11 +83,9 @@ function* generateEventExpression(options, ctx, prop) {
         if (_isCompoundExpression) {
             yield `(...[$event]) => {${utils_1.newLine}`;
             ctx.addLocalVariable('$event');
+            yield* ctx.generateConditionGuards();
             prefix = ``;
             suffix = ``;
-            for (const blockCondition of ctx.blockConditions) {
-                prefix += `if (!${blockCondition}) return${utils_1.endOfLine}`;
-            }
         }
         yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', offset => {
             if (_isCompoundExpression && isFirstMapping) {
@@ -105,6 +116,18 @@ function* generateEventExpression(options, ctx, prop) {
         yield `() => {}`;
     }
 }
+function* generateModelEventExpression(options, ctx, prop) {
+    if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+        yield `(...[$event]) => {${utils_1.newLine}`;
+        yield* ctx.generateConditionGuards();
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.verification, prop.exp.content, prop.exp.loc.start.offset, prop.exp.loc);
+        yield ` = $event${utils_1.endOfLine}`;
+        yield `}`;
+    }
+    else {
+        yield `() => {}`;
+    }
+}
 function isCompoundExpression(ts, ast) {
     let result = true;
     if (ast.statements.length === 0) {

package/lib/codegen/template/elementProps.js

@@ -77,7 +77,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             const shouldSpread = propName === 'style' || propName === 'class';
             const shouldCamelize = isComponent && getShouldCamelize(options, prop, propName);
-            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck, shouldCamelize);
+            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck);
             if (shouldSpread) {
                 yield `...{ `;
             }
@@ -120,7 +120,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             const shouldSpread = prop.name === 'style' || prop.name === 'class';
             const shouldCamelize = isComponent && getShouldCamelize(options, prop, prop.name);
-            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck, true);
+            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck);
             if (shouldSpread) {
                 yield `...{ `;
             }
@@ -223,13 +223,9 @@ function getShouldCamelize(options, prop, propName) {
         && (0, shared_2.hyphenateAttr)(propName) === propName
         && !options.vueCompilerOptions.htmlAttributes.some(pattern => (0, minimatch_1.minimatch)(propName, pattern));
 }
-function getPropsCodeInfo(ctx, strictPropsCheck, shouldCamelize) {
+function getPropsCodeInfo(ctx, strictPropsCheck) {
     return ctx.resolveCodeFeatures({
         ...codeFeatures_1.codeFeatures.withoutHighlightAndCompletion,
-        navigation: {
-            resolveRenameNewName: shared_1.camelize,
-            resolveRenameEditText: shouldCamelize ? shared_2.hyphenateAttr : undefined,
-        },
         verification: strictPropsCheck || {
             shouldReport(_source, code) {
                 // https://typescript.tv/errors/#ts2353

package/lib/codegen/template/index.d.ts

@@ -7,7 +7,6 @@ export interface TemplateCodegenOptions {
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
     template: NonNullable<Sfc['template']>;
-    edited: boolean;
     scriptSetupBindingNames: Set<string>;
     scriptSetupImportComponentNames: Set<string>;
     destructuredPropNames: Set<string>;

package/lib/codegen/template/index.js

@@ -52,8 +52,7 @@ function* generateTemplate(options) {
 }
 function* generateSlots(options, ctx) {
     if (!options.hasDefineSlots) {
-        const name = (0, shared_1.getSlotsPropertyName)(options.vueCompilerOptions.target);
-        yield `type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.${name}>`;
+        yield `type __VLS_Slots = {}`;
         for (const { expVar, propsVar } of ctx.dynamicSlots) {
             yield `${utils_1.newLine}& { [K in NonNullable<typeof ${expVar}>]?: (props: typeof ${propsVar}) => any }`;
         }
@@ -67,7 +66,7 @@ function* generateSlots(options, ctx) {
             }
             yield `?: (props: typeof ${slot.propsVar}) => any }`;
         }
-        yield `>${utils_1.endOfLine}`;
+        yield `${utils_1.endOfLine}`;
     }
     return `__VLS_Slots`;
 }

package/lib/codegen/template/interpolation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInterpolation = generateInterpolation;
 const shared_1 = require("@vue/shared");
-const scriptSetupRanges_1 = require("../../parsers/scriptSetupRanges");
+const shared_2 = require("../../utils/shared");
 const utils_1 = require("../utils");
 function* generateInterpolation(options, ctx, source, data, _code, start, astHolder = {}, prefix = '', suffix = '') {
     const code = prefix + _code + suffix;
@@ -49,7 +49,7 @@ function* generateInterpolation(options, ctx, source, data, _code, start, astHol
 function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefNames, ctx, code, offset, ast) {
     let ctxVars = [];
     const varCb = (id, isShorthand) => {
-        const text = (0, scriptSetupRanges_1.getNodeText)(ts, id, ast);
+        const text = (0, shared_2.getNodeText)(ts, id, ast);
         if (ctx.hasLocalVariable(text)
             // https://github.com/vuejs/core/blob/245230e135152900189f13a4281302de45fdcfaa/packages/compiler-core/src/transforms/transformExpression.ts#L342-L352
             || (0, shared_1.isGloballyAllowed)(text)
@@ -61,13 +61,13 @@ function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefName
             ctxVars.push({
                 text,
                 isShorthand: isShorthand,
-                offset: (0, scriptSetupRanges_1.getStartEnd)(ts, id, ast).start,
+                offset: (0, shared_2.getStartEnd)(ts, id, ast).start,
             });
             if (destructuredPropNames?.has(text)) {
                 return;
             }
             if (offset !== undefined) {
-                ctx.accessExternalVariable(text, offset + (0, scriptSetupRanges_1.getStartEnd)(ts, id, ast).start);
+                ctx.accessExternalVariable(text, offset + (0, shared_2.getStartEnd)(ts, id, ast).start);
             }
             else {
                 ctx.accessExternalVariable(text);

package/lib/codegen/template/styleScopedClasses.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStyleScopedClassReferences = generateStyleScopedClassReferences;
 exports.collectStyleScopedClassReferences = collectStyleScopedClassReferences;
 const CompilerDOM = require("@vue/compiler-dom");
-const scriptSetupRanges_1 = require("../../parsers/scriptSetupRanges");
+const shared_1 = require("../../utils/shared");
 const utils_1 = require("../utils");
 const escaped_1 = require("../utils/escaped");
 const wrapWith_1 = require("../utils/wrapWith");
@@ -126,7 +126,7 @@ function collectStyleScopedClassReferences(options, ctx, node) {
                 }
             }
             function walkIdentifier(node) {
-                const text = (0, scriptSetupRanges_1.getNodeText)(ts, node, ast);
+                const text = (0, shared_1.getNodeText)(ts, node, ast);
                 ctx.scopedClasses.push({
                     source: 'template',
                     className: text,

package/lib/codegen/utils/index.js

@@ -7,7 +7,7 @@ exports.normalizeAttributeValue = normalizeAttributeValue;
 exports.createTsAst = createTsAst;
 exports.generateSfcBlockSection = generateSfcBlockSection;
 exports.generateSfcBlockAttrValue = generateSfcBlockAttrValue;
-const scriptSetupRanges_1 = require("../../parsers/scriptSetupRanges");
+const shared_1 = require("../../utils/shared");
 exports.newLine = `\n`;
 exports.endOfLine = `;${exports.newLine}`;
 exports.combineLastMapping = { __combineOffset: 1 };
@@ -15,7 +15,7 @@ exports.identifierRegex = /^[a-zA-Z_$][0-9a-zA-Z_$]*$/;
 function collectVars(ts, node, ast, results = []) {
     const identifiers = collectIdentifiers(ts, node, []);
     for (const { id } of identifiers) {
-        results.push((0, scriptSetupRanges_1.getNodeText)(ts, id, ast));
+        results.push((0, shared_1.getNodeText)(ts, id, ast));
     }
     return results;
 }

package/lib/parsers/scriptRanges.js

@@ -1,6 +1,7 @@
 "use strict";
 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) {
     let exportDefault;
@@ -29,7 +30,7 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
                 let inheritAttrsOption;
                 ts.forEachChild(obj, node => {
                     if (ts.isPropertyAssignment(node) && ts.isIdentifier(node.name)) {
-                        const name = (0, scriptSetupRanges_1.getNodeText)(ts, node.name, ast);
+                        const name = _getNodeText(node.name);
                         if (name === 'components' && ts.isObjectLiteralExpression(node.initializer)) {
                             componentsOptionNode = node.initializer;
                         }
@@ -40,7 +41,7 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
                             nameOptionNode = node.initializer;
                         }
                         else if (name === 'inheritAttrs') {
-                            inheritAttrsOption = (0, scriptSetupRanges_1.getNodeText)(ts, node.initializer, ast);
+                            inheritAttrsOption = _getNodeText(node.initializer);
                         }
                     }
                 });
@@ -69,7 +70,10 @@ function parseScriptRanges(ts, ast, hasScriptSetup, withNode) {
         bindings,
     };
     function _getStartEnd(node) {
-        return (0, scriptSetupRanges_1.getStartEnd)(ts, node, ast);
+        return (0, shared_1.getStartEnd)(ts, node, ast);
+    }
+    function _getNodeText(node) {
+        return (0, shared_1.getNodeText)(ts, node, ast);
     }
     // isAsExpression is missing in tsc
     function isAsExpression(node) {

package/lib/parsers/scriptSetupRanges.d.ts

@@ -73,7 +73,4 @@ export declare function parseBindingRanges(ts: typeof import('typescript'), ast:
     isDefaultImport?: boolean;
     isNamespace?: boolean;
 }[];
-export declare function findBindingVars(ts: typeof import('typescript'), left: ts.BindingName, ast: ts.SourceFile): TextRange[];
-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;
 export {};

package/lib/parsers/scriptSetupRanges.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptSetupRanges = parseScriptSetupRanges;
 exports.parseBindingRanges = parseBindingRanges;
-exports.findBindingVars = findBindingVars;
-exports.getStartEnd = getStartEnd;
-exports.getNodeText = getNodeText;
 const utils_1 = require("../codegen/utils");
+const shared_1 = require("../utils/shared");
 const tsCheckReg = /^\/\/\s*@ts-(?:no)?check($|\s)/;
 function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const defineProp = [];
@@ -42,7 +40,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 importSectionEndOffset = commentRange.pos;
             }
             else {
-                importSectionEndOffset = getStartEnd(ts, node, ast).start;
+                importSectionEndOffset = (0, shared_1.getStartEnd)(ts, node, ast).start;
             }
             foundNonImportExportNode = true;
         }
@@ -282,10 +280,10 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         };
     }
     function _getStartEnd(node) {
-        return getStartEnd(ts, node, ast);
+        return (0, shared_1.getStartEnd)(ts, node, ast);
     }
     function _getNodeText(node) {
-        return getNodeText(ts, node, ast);
+        return (0, shared_1.getNodeText)(ts, node, ast);
     }
 }
 function parseBindingRanges(ts, ast) {
@@ -353,10 +351,10 @@ function parseBindingRanges(ts, ast) {
     });
     return bindings;
     function _getStartEnd(node) {
-        return getStartEnd(ts, node, ast);
+        return (0, shared_1.getStartEnd)(ts, node, ast);
     }
     function _getNodeText(node) {
-        return getNodeText(ts, node, ast);
+        return (0, shared_1.getNodeText)(ts, node, ast);
     }
     function _findBindingVars(left) {
         return findBindingVars(ts, left, ast);
@@ -368,7 +366,7 @@ function findBindingVars(ts, left, ast) {
     return vars;
     function worker(node) {
         if (ts.isIdentifier(node)) {
-            vars.push(getStartEnd(ts, node, ast));
+            vars.push((0, shared_1.getStartEnd)(ts, node, ast));
         }
         // { ? } = ...
         // [ ? ] = ...
@@ -385,7 +383,7 @@ function findBindingVars(ts, left, ast) {
         }
         // { foo } = ...
         else if (ts.isShorthandPropertyAssignment(node)) {
-            vars.push(getStartEnd(ts, node.name, ast));
+            vars.push((0, shared_1.getStartEnd)(ts, node.name, ast));
         }
         // { ...? } = ...
         // [ ...? ] = ...
@@ -394,23 +392,13 @@ function findBindingVars(ts, left, ast) {
         }
     }
 }
-function getStartEnd(ts, node, ast) {
-    return {
-        start: ts.getTokenPosOfNode(node, ast),
-        end: node.end,
-    };
-}
-function getNodeText(ts, node, ast) {
-    const { start, end } = getStartEnd(ts, node, ast);
-    return ast.text.slice(start, end);
-}
 function getStatementRange(ts, parents, node, ast) {
     let statementRange;
     for (let i = parents.length - 1; i >= 0; i--) {
         if (ts.isStatement(parents[i])) {
             const statement = parents[i];
             ts.forEachChild(statement, child => {
-                const range = getStartEnd(ts, child, ast);
+                const range = (0, shared_1.getStartEnd)(ts, child, ast);
                 statementRange ??= range;
                 statementRange.end = range.end;
             });
@@ -418,7 +406,7 @@ function getStatementRange(ts, parents, node, ast) {
         }
     }
     if (!statementRange) {
-        statementRange = getStartEnd(ts, node, ast);
+        statementRange = (0, shared_1.getStartEnd)(ts, node, ast);
     }
     return statementRange;
 }

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

@@ -201,6 +201,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
         getInternalVariable: () => string;
         getHoistVariable: (originalVar: string) => string;
         generateHoistVariables: () => Generator<string, void, unknown>;
+        generateConditionGuards: () => Generator<string, void, unknown>;
         ignoreError: () => Generator<Code>;
         expectError: (prevNode: import("@vue/compiler-dom").CommentNode) => Generator<Code>;
         resetDirectiveComments: (endStr: string) => Generator<Code>;

package/lib/plugins/vue-tsx.js

@@ -12,7 +12,6 @@ const vueCompilerOptions_1 = require("../parsers/vueCompilerOptions");
 const signals_1 = require("../utils/signals");
 const ts_1 = require("../utils/ts");
 exports.tsCodegen = new WeakMap();
-const fileEditTimes = new Map();
 const plugin = ctx => {
     let appendedGlobalTypes = false;
     return {
@@ -144,7 +143,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             compilerOptions: ctx.compilerOptions,
             vueCompilerOptions: getResolvedOptions(),
             template: sfc.template,
-            edited: getResolvedOptions().__test || (fileEditTimes.get(fileName) ?? 0) >= 2,
             scriptSetupBindingNames: getSetupBindingNames(),
             scriptSetupImportComponentNames: getSetupImportComponentNames(),
             destructuredPropNames: getSetupDestructuredPropNames(),
@@ -173,7 +171,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             compilerOptions: ctx.compilerOptions,
             vueCompilerOptions: getResolvedOptions(),
             sfc: sfc,
-            edited: getResolvedOptions().__test || (fileEditTimes.get(fileName) ?? 0) >= 2,
             fileName,
             lang: getLang(),
             scriptRanges: getScriptRanges(),
@@ -183,7 +180,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             templateRefNames: getSetupTemplateRefNames(),
             appendGlobalTypes,
         });
-        fileEditTimes.set(fileName, (fileEditTimes.get(fileName) ?? 0) + 1);
         let current = codegen.next();
         while (!current.done) {
             const code = current.value;

package/lib/types.d.ts

@@ -23,6 +23,7 @@ export interface VueCompilerOptions {
     vitePressExtensions: string[];
     petiteVueExtensions: string[];
     jsxSlots: boolean;
+    strictVModel: boolean;
     checkUnknownProps: boolean;
     checkUnknownEvents: boolean;
     checkUnknownDirectives: boolean;
@@ -61,7 +62,6 @@ export interface VueCompilerOptions {
     __setupedGlobalTypes?: true | {
         absolutePath: string;
     };
-    __test?: boolean;
 }
 export declare const validVersions: readonly [2, 2.1];
 export type VueLanguagePluginReturn = {

package/lib/utils/shared.d.ts

@@ -1,3 +1,7 @@
-export declare function getSlotsPropertyName(vueVersion: number): "$scopedSlots" | "$slots";
+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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hyphenateTag = void 0;
-exports.getSlotsPropertyName = getSlotsPropertyName;
 exports.hyphenateAttr = hyphenateAttr;
+exports.getSlotsPropertyName = getSlotsPropertyName;
+exports.getStartEnd = getStartEnd;
+exports.getNodeText = getNodeText;
 const shared_1 = require("@vue/shared");
-function getSlotsPropertyName(vueVersion) {
-    return vueVersion < 3 ? '$scopedSlots' : '$slots';
-}
 var shared_2 = require("@vue/shared");
 Object.defineProperty(exports, "hyphenateTag", { enumerable: true, get: function () { return shared_2.hyphenate; } });
 function hyphenateAttr(str) {
@@ -17,4 +16,17 @@ function hyphenateAttr(str) {
     }
     return hyphencase;
 }
+function getSlotsPropertyName(vueVersion) {
+    return vueVersion < 3 ? '$scopedSlots' : '$slots';
+}
+function getStartEnd(ts, node, ast) {
+    return {
+        start: ts.getTokenPosOfNode(node, ast),
+        end: node.end,
+    };
+}
+function getNodeText(ts, node, ast) {
+    const { start, end } = getStartEnd(ts, node, ast);
+    return ast.text.slice(start, end);
+}
 //# sourceMappingURL=shared.js.map

package/lib/utils/ts.d.ts

@@ -16,10 +16,6 @@ export declare class CompilerOptionsResolver {
     build(defaults?: VueCompilerOptions): VueCompilerOptions;
 }
 export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean): VueCompilerOptions;
-/**
- * @deprecated use `getDefaultCompilerOptions` instead
- */
-export declare function resolveVueCompilerOptions(options: Partial<VueCompilerOptions>): VueCompilerOptions;
 export declare function setupGlobalTypes(rootDir: string, vueOptions: VueCompilerOptions, host: {
     fileExists(path: string): boolean;
     writeFile?(path: string, data: string): void;

package/lib/utils/ts.js

@@ -4,7 +4,6 @@ exports.CompilerOptionsResolver = void 0;
 exports.createParsedCommandLineByJson = createParsedCommandLineByJson;
 exports.createParsedCommandLine = createParsedCommandLine;
 exports.getDefaultCompilerOptions = getDefaultCompilerOptions;
-exports.resolveVueCompilerOptions = resolveVueCompilerOptions;
 exports.setupGlobalTypes = setupGlobalTypes;
 const shared_1 = require("@vue/shared");
 const path_browserify_1 = require("path-browserify");
@@ -218,6 +217,7 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         vitePressExtensions: [],
         petiteVueExtensions: [],
         jsxSlots: false,
+        strictVModel: strictTemplates,
         checkUnknownProps: strictTemplates,
         checkUnknownEvents: strictTemplates,
         checkUnknownDirectives: strictTemplates,
@@ -271,15 +271,6 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         },
     };
 }
-/**
- * @deprecated use `getDefaultCompilerOptions` instead
- */
-function resolveVueCompilerOptions(options) {
-    return {
-        ...getDefaultCompilerOptions(options.target, options.lib),
-        ...options,
-    };
-}
 function setupGlobalTypes(rootDir, vueOptions, host) {
     if (!host.writeFile) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.2.8",
+	"version": "3.0.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "cdf00e6f19971260607ea2347924b94126a254fc"
+	"gitHead": "4b49cbe09097e482def4603b90f6c3b93bb2e913"
 }

package/lib/codegen/script/styleModulesType.d.ts

@@ -1,4 +0,0 @@
-import type { Code } from '../../types';
-import type { ScriptCodegenContext } from './context';
-import { ScriptCodegenOptions } from './index';
-export declare function generateStyleModulesType(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code>;

package/lib/codegen/script/styleModulesType.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateStyleModulesType = generateStyleModulesType;
-const utils_1 = require("../utils");
-const index_1 = require("./index");
-const template_1 = require("./template");
-function* generateStyleModulesType(options, ctx) {
-    const styles = options.sfc.styles.map((style, i) => [style, i]).filter(([style]) => style.module);
-    if (!styles.length && !options.scriptSetupRanges?.useCssModule.length) {
-        return;
-    }
-    yield `type __VLS_StyleModules = {${utils_1.newLine}`;
-    for (const [style, i] of styles) {
-        const { name, offset } = style.module;
-        if (offset) {
-            yield [
-                name,
-                'main',
-                offset + 1,
-                index_1.codeFeatures.all
-            ];
-        }
-        else {
-            yield name;
-        }
-        yield `: Record<string, string> & ${ctx.localTypes.PrettifyLocal}<{}`;
-        for (const className of style.classNames) {
-            yield* (0, template_1.generateCssClassProperty)(i, className.text, className.offset, 'string', false);
-        }
-        yield `>${utils_1.endOfLine}`;
-    }
-    yield `}${utils_1.endOfLine}`;
-}
-//# sourceMappingURL=styleModulesType.js.map

package/lib/codegen/utils/objectProperty.d.ts

@@ -1,3 +0,0 @@
-import type { Code, VueCodeInformation } from '../../types';
-export declare function getObjectProperty(code: string): string;
-export declare function generateObjectProperty(code: string, source: string, offset: number, features: VueCodeInformation, hasQuotes?: boolean, shouldCamelize?: boolean): Generator<Code>;

package/lib/codegen/utils/objectProperty.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectProperty = getObjectProperty;
-exports.generateObjectProperty = generateObjectProperty;
-const shared_1 = require("@vue/shared");
-const utils_1 = require("../utils");
-const camelized_1 = require("../utils/camelized");
-const stringLiteralKey_1 = require("../utils/stringLiteralKey");
-function getObjectProperty(code) {
-    if (utils_1.identifierRegex.test(code)) {
-        return code;
-    }
-    else {
-        return `'${code}'`;
-    }
-}
-function* generateObjectProperty(code, source, offset, features, hasQuotes = false, shouldCamelize = false) {
-    const start = offset;
-    const end = offset + code.length;
-    if (hasQuotes) {
-        code = code.slice(1, -1);
-        offset++;
-    }
-    if (shouldCamelize) {
-        if (utils_1.identifierRegex.test((0, shared_1.camelize)(code))) {
-            yield* (0, camelized_1.generateCamelized)(code, source, offset, features);
-        }
-        else {
-            yield* (0, utils_1.wrapWith)(start, end, source, features, `'`, ...(0, camelized_1.generateCamelized)(code, source, offset, features), `'`);
-        }
-    }
-    else {
-        if (utils_1.identifierRegex.test(code)) {
-            yield [code, source, offset, features];
-        }
-        else {
-            yield* (0, stringLiteralKey_1.generateStringLiteralKey)(code, source, offset, features);
-        }
-    }
-}
-//# sourceMappingURL=objectProperty.js.map