@vue/language-core 3.0.0-alpha.8 → 3.0.0-beta.1

package/index.d.ts

@@ -1,5 +1,6 @@
 export * from './lib/codegen/globalTypes';
 export * from './lib/codegen/template';
+export * from './lib/codegen/utils';
 export * from './lib/languagePlugin';
 export * from './lib/parsers/scriptSetupRanges';
 export * from './lib/plugins';

package/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsCodegen = void 0;
 __exportStar(require("./lib/codegen/globalTypes"), exports);
 __exportStar(require("./lib/codegen/template"), exports);
+__exportStar(require("./lib/codegen/utils"), exports);
 __exportStar(require("./lib/languagePlugin"), exports);
 __exportStar(require("./lib/parsers/scriptSetupRanges"), exports);
 __exportStar(require("./lib/plugins"), exports);

package/lib/codegen/codeFeatures.d.ts

@@ -78,6 +78,11 @@ declare const raw: {
         };
         verification: true;
     };
+    withoutSemantic: {
+        verification: true;
+        navigation: true;
+        completion: true;
+    };
 };
 export declare const codeFeatures: { [K in keyof typeof raw]: VueCodeInformation; };
 export {};

package/lib/codegen/codeFeatures.js

@@ -66,6 +66,11 @@ const raw = {
         semantic: { shouldHighlight: () => false },
         verification: true,
     },
+    withoutSemantic: {
+        verification: true,
+        navigation: true,
+        completion: true,
+    },
 };
 exports.codeFeatures = raw;
 //# sourceMappingURL=codeFeatures.js.map

package/lib/codegen/script/component.js

@@ -60,7 +60,7 @@ function* generateComponentSetupReturns(scriptSetupRanges) {
 }
 function* generateEmitsOption(options, scriptSetupRanges) {
     const codes = [];
-    if (scriptSetupRanges.defineProp.some(p => p.isModel)) {
+    if (scriptSetupRanges.defineModel.length) {
         codes.push({
             optionExp: `{} as __VLS_NormalizeEmits<typeof __VLS_modelEmit>`,
             typeOptionType: `__VLS_ModelEmit`,

package/lib/codegen/script/scriptSetup.js

@@ -50,7 +50,7 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
         if (scriptSetupRanges.defineEmits) {
             emitTypes.push(`typeof ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'}`);
         }
-        if (scriptSetupRanges.defineProp.some(p => p.isModel)) {
+        if (scriptSetupRanges.defineModel.length) {
             emitTypes.push(`typeof __VLS_modelEmit`);
         }
         yield `return {} as {${utils_1.newLine}`
@@ -187,7 +187,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         const templateRefType = arg
             ? [
                 `__VLS_TemplateRefs[`,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.withoutSemantic),
                 `]`
             ]
             : [`unknown`];
@@ -235,7 +235,6 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, codeFeatures_1.codeFeatures.all);
     yield* (0, index_1.generateScriptSectionPartiallyEnding)(scriptSetup.name, scriptSetup.content.length, '#3632/scriptSetup.vue');
     yield* generateMacros(options, ctx);
-    yield* generateDefineProp(options);
     if (scriptSetupRanges.defineProps?.typeArg && scriptSetupRanges.withDefaults?.arg) {
         // fix https://github.com/vuejs/language-tools/issues/1187
         yield `const __VLS_withDefaultsArg = (function <T>(t: T) { return t })(`;
@@ -276,22 +275,6 @@ function* generateMacros(options, ctx) {
         yield `}: typeof import('${options.vueCompilerOptions.lib}')${utils_1.endOfLine}`;
     }
 }
-function* generateDefineProp(options) {
-    const definePropProposalA = options.vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
-    const definePropProposalB = options.vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
-    if (definePropProposalA || definePropProposalB) {
-        yield `type __VLS_PropOptions<T> = Exclude<import('${options.vueCompilerOptions.lib}').Prop<T>, import('${options.vueCompilerOptions.lib}').PropType<T>>${utils_1.endOfLine}`;
-        if (definePropProposalA) {
-            yield `declare function defineProp<T>(name: string, options: ({ required: true } | { default: T }) & __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
-            yield `declare function defineProp<T>(name?: string, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${utils_1.endOfLine}`;
-        }
-        if (definePropProposalB) {
-            yield `declare function defineProp<T>(value: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
-            yield `declare function defineProp<T>(value: T | (() => T) | undefined, required: true, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
-            yield `declare function defineProp<T>(value?: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${utils_1.endOfLine}`;
-        }
-    }
-}
 function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, defaultName, typeName) {
     if (typeArg) {
         yield [[
@@ -348,24 +331,15 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `${ctx.localTypes.OmitKeepDiscriminatedUnion}<InstanceType<typeof __VLS_fnComponent>['$props'], keyof __VLS_BuiltInPublicProps>`;
         yield utils_1.endOfLine;
     }
-    if (scriptSetupRanges.defineProp.length) {
+    if (scriptSetupRanges.defineModel.length) {
         yield `const __VLS_defaults = {${utils_1.newLine}`;
-        for (const defineProp of scriptSetupRanges.defineProp) {
-            if (!defineProp.defaultValue) {
-                continue;
-            }
-            const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
-            if (defineProp.name || defineProp.isModel) {
-                yield `'${propName}'`;
-            }
-            else if (defineProp.localName) {
-                yield localName;
-            }
-            else {
+        for (const defineModel of scriptSetupRanges.defineModel) {
+            if (!defineModel.defaultValue) {
                 continue;
             }
-            yield `: `;
-            yield getRangeText(scriptSetup, defineProp.defaultValue);
+            const [propName] = getPropAndLocalName(scriptSetup, defineModel);
+            yield `'${propName}': `;
+            yield getRangeText(scriptSetup, defineModel.defaultValue);
             yield `,${utils_1.newLine}`;
         }
         yield `}${utils_1.endOfLine}`;
@@ -385,38 +359,30 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         ctx.generatedPropsType = true;
         yield `__VLS_Props`;
     }
-    if (scriptSetupRanges.defineProp.length) {
+    if (scriptSetupRanges.defineModel.length) {
         if (ctx.generatedPropsType) {
             yield ` & `;
         }
         ctx.generatedPropsType = true;
         yield `{${utils_1.newLine}`;
-        for (const defineProp of scriptSetupRanges.defineProp) {
-            const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
-            if (defineProp.comments) {
-                yield scriptSetup.content.slice(defineProp.comments.start, defineProp.comments.end);
+        for (const defineModel of scriptSetupRanges.defineModel) {
+            const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
+            if (defineModel.comments) {
+                yield scriptSetup.content.slice(defineModel.comments.start, defineModel.comments.end);
                 yield utils_1.newLine;
             }
-            if (defineProp.isModel && !defineProp.name) {
-                yield propName;
-            }
-            else if (defineProp.name) {
-                yield* (0, camelized_1.generateCamelized)(getRangeText(scriptSetup, defineProp.name), scriptSetup.name, defineProp.name.start, codeFeatures_1.codeFeatures.navigation);
-            }
-            else if (defineProp.localName) {
-                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.localName.start, defineProp.localName.end, codeFeatures_1.codeFeatures.navigation);
+            if (defineModel.name) {
+                yield* (0, camelized_1.generateCamelized)(getRangeText(scriptSetup, defineModel.name), scriptSetup.name, defineModel.name.start, codeFeatures_1.codeFeatures.navigation);
             }
             else {
-                continue;
+                yield propName;
             }
-            yield defineProp.required
-                ? `: `
-                : `?: `;
-            yield* generateDefinePropType(scriptSetup, propName, localName, defineProp);
+            yield defineModel.required ? `: ` : `?: `;
+            yield* generateDefineModelType(scriptSetup, propName, localName, defineModel);
             yield `,${utils_1.newLine}`;
-            if (defineProp.modifierType) {
-                const modifierName = `${defineProp.name ? propName : 'model'}Modifiers`;
-                const modifierType = getRangeText(scriptSetup, defineProp.modifierType);
+            if (defineModel.modifierType) {
+                const modifierName = `${defineModel.name ? propName : 'model'}Modifiers`;
+                const modifierType = getRangeText(scriptSetup, defineModel.modifierType);
                 yield `'${modifierName}'?: Partial<Record<${modifierType}, true>>,${utils_1.newLine}`;
             }
         }
@@ -428,13 +394,12 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
     yield utils_1.endOfLine;
 }
 function* generateModelEmit(scriptSetup, scriptSetupRanges) {
-    const defineModels = scriptSetupRanges.defineProp.filter(p => p.isModel);
-    if (defineModels.length) {
+    if (scriptSetupRanges.defineModel.length) {
         yield `type __VLS_ModelEmit = {${utils_1.newLine}`;
-        for (const defineModel of defineModels) {
+        for (const defineModel of scriptSetupRanges.defineModel) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
             yield `'update:${propName}': [value: `;
-            yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);
+            yield* generateDefineModelType(scriptSetup, propName, localName, defineModel);
             if (!defineModel.required && !defineModel.defaultValue) {
                 yield ` | undefined`;
             }
@@ -444,32 +409,30 @@ function* generateModelEmit(scriptSetup, scriptSetupRanges) {
         yield `const __VLS_modelEmit = defineEmits<__VLS_ModelEmit>()${utils_1.endOfLine}`;
     }
 }
-function* generateDefinePropType(scriptSetup, propName, localName, defineProp) {
-    if (defineProp.type) {
-        // Infer from defineProp<T>
-        yield getRangeText(scriptSetup, defineProp.type);
+function* generateDefineModelType(scriptSetup, propName, localName, defineModel) {
+    if (defineModel.type) {
+        // Infer from defineModel<T>
+        yield getRangeText(scriptSetup, defineModel.type);
     }
-    else if (defineProp.runtimeType && localName) {
+    else if (defineModel.runtimeType && localName) {
         // Infer from actual prop declaration code 
         yield `typeof ${localName}['value']`;
     }
-    else if (defineProp.defaultValue && propName) {
-        // Infer from defineProp({default: T})
+    else if (defineModel.defaultValue && propName) {
+        // Infer from defineModel({default: T})
         yield `typeof __VLS_defaults['${propName}']`;
     }
     else {
         yield `any`;
     }
 }
-function getPropAndLocalName(scriptSetup, defineProp) {
-    const localName = defineProp.localName
-        ? getRangeText(scriptSetup, defineProp.localName)
+function getPropAndLocalName(scriptSetup, defineModel) {
+    const localName = defineModel.localName
+        ? getRangeText(scriptSetup, defineModel.localName)
         : undefined;
-    const propName = defineProp.name
-        ? (0, shared_1.camelize)(getRangeText(scriptSetup, defineProp.name).slice(1, -1))
-        : defineProp.isModel
-            ? 'modelValue'
-            : localName;
+    const propName = defineModel.name
+        ? (0, shared_1.camelize)(getRangeText(scriptSetup, defineModel.name).slice(1, -1))
+        : 'modelValue';
     return [propName, localName];
 }
 function getRangeText(scriptSetup, range) {

package/lib/codegen/style/imports.d.ts

@@ -0,0 +1,2 @@
+import type { Code, Sfc } from '../../types';
+export declare function generateStyleImports(style: Sfc['styles'][number]): Generator<Code>;

package/lib/codegen/style/imports.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateStyleImports = generateStyleImports;
+const utils_1 = require("../utils");
+const wrapWith_1 = require("../utils/wrapWith");
+function* generateStyleImports(style) {
+    const features = {
+        navigation: true,
+        verification: true
+    };
+    if (typeof style.src === 'object') {
+        yield `${utils_1.newLine} & typeof import(`;
+        yield* (0, wrapWith_1.wrapWith)(style.src.offset, style.src.offset + style.src.text.length, 'main', features, `'`, [style.src.text, 'main', style.src.offset, utils_1.combineLastMapping], `'`);
+        yield `).default`;
+    }
+    for (const { text, offset } of style.imports) {
+        yield `${utils_1.newLine} & typeof import('`;
+        yield [
+            text,
+            style.name,
+            offset,
+            features
+        ];
+        yield `').default`;
+    }
+}
+//# sourceMappingURL=imports.js.map

package/lib/codegen/style/modules.js

@@ -4,6 +4,7 @@ exports.generateStyleModules = generateStyleModules;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const classProperty_1 = require("./classProperty");
+const imports_1 = require("./imports");
 function* generateStyleModules(options) {
     const styles = options.sfc.styles.map((style, i) => [style, i]).filter(([style]) => style.module);
     if (!styles.length && !options.scriptSetupRanges?.useCssModule.length) {
@@ -20,10 +21,17 @@ function* generateStyleModules(options) {
                 text,
                 'main',
                 offset,
-                codeFeatures_1.codeFeatures.withoutHighlight
+                codeFeatures_1.codeFeatures.navigation,
             ];
         }
-        yield `: Record<string, string> & __VLS_PrettifyGlobal<{}`;
+        yield `: `;
+        if (!options.vueCompilerOptions.strictCssModules) {
+            yield `Record<string, string> & `;
+        }
+        yield `__VLS_PrettifyGlobal<{}`;
+        if (options.vueCompilerOptions.resolveStyleImports) {
+            yield* (0, imports_1.generateStyleImports)(style);
+        }
         for (const className of style.classNames) {
             yield* (0, classProperty_1.generateClassProperty)(i, className.text, className.offset, 'string');
         }

package/lib/codegen/style/scopedClasses.js

@@ -3,17 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStyleScopedClasses = generateStyleScopedClasses;
 const utils_1 = require("../utils");
 const classProperty_1 = require("./classProperty");
+const imports_1 = require("./imports");
 function* generateStyleScopedClasses(options, ctx) {
-    const option = options.vueCompilerOptions.experimentalResolveStyleCssClasses;
+    const option = options.vueCompilerOptions.resolveStyleClassNames;
     const styles = options.sfc.styles
         .map((style, i) => [style, i])
-        .filter(([style]) => option === 'always' || (option === 'scoped' && style.scoped));
+        .filter(([style]) => option === true || (option === 'scoped' && style.scoped));
     if (!styles.length) {
         return;
     }
     const firstClasses = new Set();
     yield `type __VLS_StyleScopedClasses = {}`;
     for (const [style, i] of styles) {
+        if (options.vueCompilerOptions.resolveStyleImports) {
+            yield* (0, imports_1.generateStyleImports)(style);
+        }
         for (const className of style.classNames) {
             if (firstClasses.has(className.text)) {
                 ctx.scopedClasses.push({

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

@@ -129,6 +129,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         withoutHighlightAndNavigation: VueCodeInformation;
         withoutHighlightAndCompletion: VueCodeInformation;
         withoutHighlightAndCompletionAndNavigation: VueCodeInformation;
+        withoutSemantic: VueCodeInformation;
     };
     resolveCodeFeatures: (features: VueCodeInformation) => VueCodeInformation;
     inVFor: boolean;

package/lib/codegen/template/interpolation.js

@@ -114,7 +114,9 @@ function* generateVar(templateRefNames, ctx, code, offset, curVar) {
         if (ctx.dollarVars.has(curVar.text)) {
             yield [`__VLS_dollars.`, undefined];
         }
-        yield [`__VLS_ctx.`, undefined];
+        else {
+            yield [`__VLS_ctx.`, undefined];
+        }
         yield [code.slice(curVar.offset, curVar.offset + curVar.text.length), curVar.offset];
     }
 }

package/lib/parsers/scriptSetupRanges.d.ts

@@ -6,7 +6,7 @@ type CallExpressionRange = {
     arg?: TextRange;
     typeArg?: TextRange;
 };
-type DefineProp = {
+type DefineModel = {
     localName?: TextRange;
     name?: TextRange;
     type?: TextRange;
@@ -14,7 +14,6 @@ type DefineProp = {
     runtimeType?: TextRange;
     defaultValue?: TextRange;
     required?: boolean;
-    isModel?: boolean;
     comments?: TextRange;
     argNode?: ts.Expression;
 };
@@ -55,7 +54,7 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript'),
         isDefaultImport?: boolean;
         isNamespace?: boolean;
     }[];
-    defineProp: DefineProp[];
+    defineModel: DefineModel[];
     defineProps: DefineProps | undefined;
     withDefaults: WithDefaults | undefined;
     defineEmits: DefineEmits | undefined;
@@ -73,4 +72,5 @@ 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 {};

package/lib/parsers/scriptSetupRanges.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptSetupRanges = parseScriptSetupRanges;
 exports.parseBindingRanges = parseBindingRanges;
+exports.findBindingVars = findBindingVars;
 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 = [];
+    const defineModel = [];
     let defineProps;
     let withDefaults;
     let defineEmits;
@@ -17,8 +18,6 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const useCssModule = [];
     const useSlots = [];
     const useTemplateRef = [];
-    const definePropProposalA = vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
-    const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
     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;
@@ -26,24 +25,27 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     let foundNonImportExportNode = false;
     let importSectionEndOffset = 0;
     ts.forEachChild(ast, node => {
-        const isTypeExport = (ts.isTypeAliasDeclaration(node) || ts.isInterfaceDeclaration(node))
-            && node.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);
-        if (!foundNonImportExportNode
-            && !ts.isImportDeclaration(node)
-            && !isTypeExport
-            && !ts.isEmptyStatement(node)
+        if (foundNonImportExportNode
+            || ts.isImportDeclaration(node)
+            || ts.isExportDeclaration(node)
+            || ts.isEmptyStatement(node)
             // fix https://github.com/vuejs/language-tools/issues/1223
-            && !ts.isImportEqualsDeclaration(node)) {
-            const commentRanges = ts.getLeadingCommentRanges(text, node.pos);
-            if (commentRanges?.length) {
-                const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
-                importSectionEndOffset = commentRange.pos;
-            }
-            else {
-                importSectionEndOffset = (0, shared_1.getStartEnd)(ts, node, ast).start;
-            }
-            foundNonImportExportNode = true;
+            || ts.isImportEqualsDeclaration(node)) {
+            return;
+        }
+        if ((ts.isTypeAliasDeclaration(node) || ts.isInterfaceDeclaration(node))
+            && node.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)) {
+            return;
+        }
+        const commentRanges = ts.getLeadingCommentRanges(text, node.pos);
+        if (commentRanges?.length) {
+            const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
+            importSectionEndOffset = commentRange.pos;
+        }
+        else {
+            importSectionEndOffset = (0, shared_1.getStartEnd)(ts, node, ast).start;
         }
+        foundNonImportExportNode = true;
     });
     ts.forEachChild(ast, node => visitNode(node, [ast]));
     const templateRefNames = new Set(useTemplateRef.map(ref => ref.name));
@@ -55,7 +57,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         leadingCommentEndOffset,
         importSectionEndOffset,
         bindings,
-        defineProp,
+        defineModel,
         defineProps,
         withDefaults,
         defineEmits,
@@ -72,8 +74,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         if (ts.isCallExpression(node)
             && ts.isIdentifier(node.expression)) {
             const callText = _getNodeText(node.expression);
-            const isDefineModel = vueCompilerOptions.macros.defineModel.includes(callText);
-            if (isDefineModel || callText === 'defineProp') {
+            if (vueCompilerOptions.macros.defineModel.includes(callText)) {
                 let localName;
                 let propName;
                 let options;
@@ -82,8 +83,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 let runtimeType;
                 let defaultValue;
                 let required = false;
-                if (ts.isVariableDeclaration(parent) &&
-                    ts.isIdentifier(parent.name)) {
+                if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) {
                     localName = _getStartEnd(parent.name);
                 }
                 if (node.typeArguments) {
@@ -94,39 +94,16 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                         modifierType = _getStartEnd(node.typeArguments[1]);
                     }
                 }
-                if (isDefineModel) {
-                    if (node.arguments.length >= 2) {
-                        propName = node.arguments[0];
-                        options = node.arguments[1];
-                    }
-                    else if (node.arguments.length >= 1) {
-                        if (ts.isStringLiteralLike(node.arguments[0])) {
-                            propName = node.arguments[0];
-                        }
-                        else {
-                            options = node.arguments[0];
-                        }
-                    }
+                if (node.arguments.length >= 2) {
+                    propName = node.arguments[0];
+                    options = node.arguments[1];
                 }
-                else if (definePropProposalA) {
-                    if (node.arguments.length >= 2) {
-                        options = node.arguments[1];
-                    }
-                    if (node.arguments.length >= 1) {
+                else if (node.arguments.length >= 1) {
+                    if (ts.isStringLiteralLike(node.arguments[0])) {
                         propName = node.arguments[0];
                     }
-                }
-                else if (definePropProposalB) {
-                    if (node.arguments.length >= 3) {
-                        options = node.arguments[2];
-                    }
-                    if (node.arguments.length >= 2) {
-                        if (node.arguments[1].kind === ts.SyntaxKind.TrueKeyword) {
-                            required = true;
-                        }
-                    }
-                    if (node.arguments.length >= 1) {
-                        defaultValue = _getStartEnd(node.arguments[0]);
+                    else {
+                        options = node.arguments[0];
                     }
                 }
                 if (options && ts.isObjectLiteralExpression(options)) {
@@ -150,7 +127,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 if (propName && ts.isStringLiteralLike(propName)) {
                     name = _getStartEnd(propName);
                 }
-                defineProp.push({
+                defineModel.push({
                     localName,
                     name,
                     type,
@@ -158,7 +135,6 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     runtimeType,
                     defaultValue,
                     required,
-                    isModel: isDefineModel,
                     comments: getClosestMultiLineCommentRange(ts, node, parents, ast),
                     argNode: options,
                 });

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

@@ -27,7 +27,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             isDefaultImport?: boolean;
             isNamespace?: boolean;
         }[];
-        defineProp: {
+        defineModel: {
             localName?: import("../types").TextRange;
             name?: import("../types").TextRange;
             type?: import("../types").TextRange;
@@ -35,7 +35,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
             runtimeType?: import("../types").TextRange;
             defaultValue?: import("../types").TextRange;
             required?: boolean;
-            isModel?: boolean;
             comments?: import("../types").TextRange;
             argNode?: import("typescript").Expression;
         }[];
@@ -165,6 +164,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             withoutHighlightAndNavigation: import("../types").VueCodeInformation;
             withoutHighlightAndCompletion: import("../types").VueCodeInformation;
             withoutHighlightAndCompletionAndNavigation: import("../types").VueCodeInformation;
+            withoutSemantic: import("../types").VueCodeInformation;
         };
         resolveCodeFeatures: (features: import("../types").VueCodeInformation) => import("../types").VueCodeInformation;
         inVFor: boolean;

package/lib/types.d.ts

@@ -25,6 +25,7 @@ export interface VueCompilerOptions {
     jsxSlots: boolean;
     strictSlotChildren: boolean;
     strictVModel: boolean;
+    strictCssModules: boolean;
     checkUnknownProps: boolean;
     checkUnknownEvents: boolean;
     checkUnknownDirectives: boolean;
@@ -37,6 +38,8 @@ export interface VueCompilerOptions {
     inferTemplateDollarSlots: boolean;
     skipTemplateCodegen: boolean;
     fallthroughAttributes: boolean;
+    resolveStyleImports: boolean;
+    resolveStyleClassNames: boolean | 'scoped';
     fallthroughComponentNames: string[];
     dataAttributes: string[];
     htmlAttributes: string[];
@@ -57,8 +60,6 @@ export interface VueCompilerOptions {
         useTemplateRef: string[];
     };
     plugins: VueLanguagePlugin[];
-    experimentalDefinePropProposal: 'kevinEdition' | 'johnsonEdition' | false;
-    experimentalResolveStyleCssClasses: 'scoped' | 'always' | 'never';
     experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
     __setupedGlobalTypes?: true | {
         absolutePath: string;
@@ -133,8 +134,13 @@ export interface Sfc {
         ast: ts.SourceFile;
     } | undefined;
     styles: readonly (SfcBlock & {
+        src: SfcBlockAttr | undefined;
+        module: SfcBlockAttr | undefined;
         scoped: boolean;
-        module?: SfcBlockAttr | undefined;
+        imports: {
+            text: string;
+            offset: number;
+        }[];
         cssVars: {
             text: string;
             offset: number;

package/lib/utils/parseCssImports.d.ts

@@ -0,0 +1,4 @@
+export declare function parseCssImports(css: string): Generator<{
+    text: string;
+    offset: number;
+}, void, unknown>;

package/lib/utils/parseCssImports.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCssImports = parseCssImports;
+const cssImportReg = /(?<=@import\s+url\()(["']?).*?\1(?=\))|(?<=@import\b\s*)(["']).*?\2/g;
+function* parseCssImports(css) {
+    const matches = css.matchAll(cssImportReg);
+    for (const match of matches) {
+        let text = match[0];
+        let offset = match.index;
+        if (text.startsWith('\'') || text.startsWith('"')) {
+            text = text.slice(1, -1);
+            offset += 1;
+        }
+        if (text) {
+            yield { text, offset };
+        }
+    }
+}
+//# sourceMappingURL=parseCssImports.js.map

package/lib/utils/ts.js

@@ -131,7 +131,7 @@ class CompilerOptionsResolver {
                     break;
                 case 'plugins':
                     this.plugins = (options.plugins ?? [])
-                        .map((pluginPath) => {
+                        .flatMap((pluginPath) => {
                         try {
                             const resolvedPath = resolvePath(pluginPath, rootDir);
                             if (resolvedPath) {
@@ -219,6 +219,7 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         jsxSlots: false,
         strictSlotChildren: strictTemplates,
         strictVModel: strictTemplates,
+        strictCssModules: false,
         checkUnknownProps: strictTemplates,
         checkUnknownEvents: strictTemplates,
         checkUnknownDirectives: strictTemplates,
@@ -231,6 +232,8 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         inferTemplateDollarSlots: false,
         skipTemplateCodegen: false,
         fallthroughAttributes: false,
+        resolveStyleImports: false,
+        resolveStyleClassNames: 'scoped',
         fallthroughComponentNames: [
             'Transition',
             'KeepAlive',
@@ -256,8 +259,6 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
             useTemplateRef: ['useTemplateRef', 'templateRef'],
         },
         plugins: [],
-        experimentalDefinePropProposal: false,
-        experimentalResolveStyleCssClasses: 'scoped',
         experimentalModelPropName: {
             '': {
                 input: true

package/lib/virtualFile/computedSfc.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedSfc = computedSfc;
 const alien_signals_1 = require("alien-signals");
 const parseCssClassNames_1 = require("../utils/parseCssClassNames");
+const parseCssImports_1 = require("../utils/parseCssImports");
 const parseCssVars_1 = require("../utils/parseCssVars");
 const signals_1 = require("../utils/signals");
 function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
@@ -86,13 +87,17 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     });
     const styles = (0, signals_1.computedArray)((0, alien_signals_1.computed)(() => getParseResult()?.descriptor.styles ?? []), (getBlock, i) => {
         const base = computedSfcBlock('style_' + i, 'css', getBlock);
+        const getSrc = computedAttrValue('__src', base, getBlock);
         const getModule = computedAttrValue('__module', base, getBlock);
         const getScoped = (0, alien_signals_1.computed)(() => !!getBlock().scoped);
+        const getImports = (0, signals_1.computedItems)(() => [...(0, parseCssImports_1.parseCssImports)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         const getCssVars = (0, signals_1.computedItems)(() => [...(0, parseCssVars_1.parseCssVars)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         const getClassNames = (0, signals_1.computedItems)(() => [...(0, parseCssClassNames_1.parseCssClassNames)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         return () => mergeObject(base, {
+            get src() { return getSrc(); },
             get module() { return getModule(); },
             get scoped() { return getScoped(); },
+            get imports() { return getImports(); },
             get cssVars() { return getCssVars(); },
             get classNames() { return getClassNames(); },
         });

package/package.json

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

package/lib/utils/vue2TemplateCompiler.d.ts

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

package/lib/utils/vue2TemplateCompiler.js

@@ -1,89 +0,0 @@
-"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 || {} // user transforms
-        )
-    }));
-    return CompilerDOM.generate(ast, Object.assign({}, options, {
-        prefixIdentifiers
-    }));
-}
-//# sourceMappingURL=vue2TemplateCompiler.js.map