@vue/language-core 3.1.6 → 3.1.7

package/lib/codegen/script/index.js

@@ -33,10 +33,10 @@ function* generateWorker(options, ctx) {
             const { expression: options } = componentOptions ?? exportDefault;
             yield* (0, utils_1.generateSfcBlockSection)(script, 0, options.start, codeFeatures_1.codeFeatures.all);
             yield exportExpression;
-            yield* (0, utils_1.generateSfcBlockSection)(script, options.end, script.content.length, codeFeatures_1.codeFeatures.all, true);
+            yield* (0, utils_1.generateSfcBlockSection)(script, options.end, script.content.length, codeFeatures_1.codeFeatures.all);
         }
         else {
-            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all, true);
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all);
             yield `export default ${exportExpression}${utils_1.endOfLine}`;
         }
         // <script setup>
@@ -88,7 +88,7 @@ function* generateWorker(options, ctx) {
                     label: wrapRight || '[Missing optionsWrapper[1]]',
                 });
             }
-            yield* (0, utils_1.generateSfcBlockSection)(script, 0, exportDefault.start, codeFeatures_1.codeFeatures.all, true);
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, exportDefault.start, codeFeatures_1.codeFeatures.all);
             yield* generateExportDeclareEqual(script);
             if (wrapLeft) {
                 yield wrapLeft;
@@ -104,7 +104,7 @@ function* generateWorker(options, ctx) {
             yield* (0, utils_1.generateSfcBlockSection)(script, expression.end, script.content.length, codeFeatures_1.codeFeatures.all);
         }
         else {
-            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all, true);
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all);
             yield* generateExportDeclareEqual(script);
             yield `(await import('${vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
             yield* (0, template_1.generateTemplate)(options, ctx);

package/lib/codegen/script/scriptSetup.js

@@ -81,7 +81,7 @@ function* generateGeneric(options, ctx, scriptSetup, scriptSetupRanges, generic,
     }
     yield `) => void${utils_1.endOfLine}`;
     yield `	attrs: any${utils_1.endOfLine}`;
-    yield `	slots: ${names.Slots}${utils_1.endOfLine}`;
+    yield `	slots: ${hasSlotsType(options) ? names.Slots : `{}`}${utils_1.endOfLine}`;
     yield `	emit: ${emitTypes.length ? emitTypes.join(` & `) : `{}`}${utils_1.endOfLine}`;
     yield `}${utils_1.endOfLine}`;
     yield `})(),${utils_1.newLine}`; // __VLS_setup = (async () => {
@@ -194,7 +194,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, bo
             }));
         }
     }
-    yield* (0, transform_1.generateCodeWithTransforms)(Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset), scriptSetup.content.length, transforms, (start, end) => (0, utils_1.generateSfcBlockSection)(scriptSetup, start, end, codeFeatures_1.codeFeatures.all, end === scriptSetup.content.length));
+    yield* (0, transform_1.generateCodeWithTransforms)(Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset), scriptSetup.content.length, transforms, (start, end) => (0, utils_1.generateSfcBlockSection)(scriptSetup, start, end, codeFeatures_1.codeFeatures.all));
     yield* generateMacros(options);
     yield* generateModels(scriptSetup, scriptSetupRanges);
     yield* generatePublicProps(options, ctx, scriptSetup, scriptSetupRanges);

package/lib/codegen/template/element.js

@@ -304,7 +304,8 @@ function* generateStyleScopedClassReferences({ template, ts }, node) {
                     if (ts.isPropertyAssignment(property)) {
                         const { name } = property;
                         if (ts.isIdentifier(name)) {
-                            yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, name.text, name.end - name.text.length + startOffset);
+                            const text = (0, shared_2.getNodeText)(ts, name, ast);
+                            yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, text, name.end - text.length + startOffset);
                         }
                         else if (ts.isStringLiteral(name)) {
                             literals.push(name);
@@ -317,7 +318,8 @@ function* generateStyleScopedClassReferences({ template, ts }, node) {
                         }
                     }
                     else if (ts.isShorthandPropertyAssignment(property)) {
-                        yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, property.name.text, property.name.end - property.name.text.length + startOffset);
+                        const text = (0, shared_2.getNodeText)(ts, property.name, ast);
+                        yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, text, property.name.end - text.length + startOffset);
                     }
                 }
             }

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

@@ -1,8 +1,8 @@
 import type * as ts from 'typescript';
-import type { Code, SfcBlock, VueCodeInformation } from '../../types';
+import type { Code, Sfc, SfcBlock, VueCodeInformation } from '../../types';
 export declare const newLine = "\n";
 export declare const endOfLine = ";\n";
 export declare const identifierRegex: RegExp;
 export declare function getTypeScriptAST(ts: typeof import('typescript'), block: SfcBlock, text: string): ts.SourceFile;
-export declare function generateSfcBlockSection(block: SfcBlock, start: number, end: number, features: VueCodeInformation, partiallyEnd?: boolean): Generator<Code>;
+export declare function generateSfcBlockSection(block: NonNullable<Sfc['script' | 'scriptSetup']>, start: number, end: number, features: VueCodeInformation): Generator<Code>;
 export declare function forEachNode(ts: typeof import('typescript'), node: ts.Node): Generator<ts.Node>;

package/lib/codegen/utils/index.js

@@ -34,18 +34,20 @@ function getTypeScriptAST(ts, block, text) {
     cacheMap[1].set(text, [ast, 1]);
     return ast;
 }
-function* generateSfcBlockSection(block, start, end, features, partiallyEnd = false) {
-    yield [
-        block.content.slice(start, end),
-        block.name,
-        start,
-        features,
-    ];
+function* generateSfcBlockSection(block, start, end, features) {
+    const text = block.content.slice(start, end);
+    yield [text, block.name, start, features];
     // #3632
-    if (partiallyEnd) {
-        yield `;`;
-        yield ['', block.name, end, codeFeatures_1.codeFeatures.verification];
-        yield exports.newLine;
+    if ('parseDiagnostics' in block.ast) {
+        const emptyEndLength = text.length - text.trimEnd().length;
+        for (const diag of block.ast.parseDiagnostics) {
+            if (diag.start >= end - emptyEndLength) {
+                yield `;`;
+                yield ['', block.name, end, codeFeatures_1.codeFeatures.verification];
+                yield exports.newLine;
+                break;
+            }
+        }
     }
 }
 function* forEachNode(ts, node) {

package/lib/languagePlugin.js

@@ -47,14 +47,14 @@ function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFile
         createVirtualCode(scriptId, languageId, snapshot) {
             const fileName = asFileName(scriptId);
             if (plugins.some(plugin => plugin.isValidFile?.(fileName, languageId))) {
-                const code = fileRegistry.get(fileName);
+                const code = fileRegistry.get(String(scriptId));
                 if (code) {
                     code.update(snapshot);
                     return code;
                 }
                 else {
                     const code = new virtualCode_1.VueVirtualCode(fileName, languageId, snapshot, vueCompilerOptions, plugins, ts);
-                    fileRegistry.set(fileName, code);
+                    fileRegistry.set(String(scriptId), code);
                     return code;
                 }
             }
@@ -64,8 +64,7 @@ function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFile
             return code;
         },
         disposeVirtualCode(scriptId) {
-            const fileName = asFileName(scriptId);
-            fileRegistry.delete(fileName);
+            fileRegistry.delete(String(scriptId));
         },
         typescript: {
             extraFileExtensions: getAllExtensions(vueCompilerOptions)

package/lib/parsers/scriptRanges.d.ts

@@ -1,8 +1,8 @@
 import type * as ts from 'typescript';
-import type { TextRange } from '../types';
+import type { TextRange, VueCompilerOptions } from '../types';
 export interface ScriptRanges extends ReturnType<typeof parseScriptRanges> {
 }
-export declare function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, hasScriptSetup: boolean): {
+export declare function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, vueCompilerOptions: VueCompilerOptions): {
     exportDefault: (TextRange & {
         expression: TextRange;
     }) | undefined;
@@ -16,10 +16,6 @@ export declare function parseScriptRanges(ts: typeof import('typescript'), ast:
         name: TextRange | undefined;
         inheritAttrs: string | undefined;
     } | undefined;
-    bindings: {
-        range: TextRange;
-        moduleName?: string;
-        isDefaultImport?: boolean;
-        isNamespace?: boolean;
-    }[];
+    bindings: TextRange[];
+    components: TextRange[];
 };

package/lib/parsers/scriptRanges.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseScriptRanges = parseScriptRanges;
 const shared_1 = require("../utils/shared");
 const utils_1 = require("./utils");
-function parseScriptRanges(ts, ast, hasScriptSetup) {
+function parseScriptRanges(ts, ast, vueCompilerOptions) {
     let exportDefault;
     let componentOptions;
-    const bindings = hasScriptSetup ? (0, utils_1.parseBindingRanges)(ts, ast) : [];
+    const { bindings, components } = (0, utils_1.parseBindingRanges)(ts, ast, vueCompilerOptions.extensions);
     ts.forEachChild(ast, raw => {
         if (ts.isExportAssignment(raw)) {
             exportDefault = {
@@ -70,6 +70,7 @@ function parseScriptRanges(ts, ast, hasScriptSetup) {
         exportDefault,
         componentOptions,
         bindings,
+        components,
     };
     function _getStartEnd(node) {
         return (0, shared_1.getStartEnd)(ts, node, ast);

package/lib/parsers/scriptSetupRanges.d.ts

@@ -48,12 +48,8 @@ export interface ScriptSetupRanges extends ReturnType<typeof parseScriptSetupRan
 export declare function parseScriptSetupRanges(ts: typeof import('typescript'), ast: ts.SourceFile, vueCompilerOptions: VueCompilerOptions): {
     leadingCommentEndOffset: number;
     importSectionEndOffset: number;
-    bindings: {
-        range: TextRange;
-        moduleName?: string;
-        isDefaultImport?: boolean;
-        isNamespace?: boolean;
-    }[];
+    bindings: TextRange[];
+    components: TextRange[];
     defineModel: DefineModel[];
     defineProps: DefineProps | undefined;
     withDefaults: WithDefaults | undefined;

package/lib/parsers/scriptSetupRanges.js

@@ -20,7 +20,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const text = ast.text;
     const leadingCommentRanges = ts.getLeadingCommentRanges(text, 0)?.reverse() ?? [];
     const leadingCommentEndOffset = leadingCommentRanges.find(range => tsCheckReg.test(text.slice(range.pos, range.end)))?.end ?? 0;
-    let bindings = (0, utils_1.parseBindingRanges)(ts, ast);
+    let { bindings, components } = (0, utils_1.parseBindingRanges)(ts, ast, vueCompilerOptions.extensions);
     let foundNonImportExportNode = false;
     let importSectionEndOffset = 0;
     ts.forEachChild(ast, node => {
@@ -48,7 +48,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     });
     ts.forEachChild(ast, node => visitNode(node, [ast]));
     const templateRefNames = new Set(useTemplateRef.map(ref => ref.name));
-    bindings = bindings.filter(({ range }) => {
+    bindings = bindings.filter(range => {
         const name = text.slice(range.start, range.end);
         return !templateRefNames.has(name);
     });
@@ -56,6 +56,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
         leadingCommentEndOffset,
         importSectionEndOffset,
         bindings,
+        components,
         defineModel,
         defineProps,
         withDefaults,

package/lib/parsers/utils.d.ts

@@ -1,11 +1,9 @@
 import type * as ts from 'typescript';
 import type { TextRange } from '../types';
-export declare function parseBindingRanges(ts: typeof import('typescript'), ast: ts.SourceFile): {
-    range: TextRange;
-    moduleName?: string;
-    isDefaultImport?: boolean;
-    isNamespace?: boolean;
-}[];
+export declare function parseBindingRanges(ts: typeof import('typescript'), ast: ts.SourceFile, componentExtsensions: string[]): {
+    bindings: TextRange[];
+    components: TextRange[];
+};
 export declare function getClosestMultiLineCommentRange(ts: typeof import('typescript'), node: ts.Node, parents: ts.Node[], ast: ts.SourceFile): {
     start: number;
     end: number;

package/lib/parsers/utils.js

@@ -4,44 +4,37 @@ exports.parseBindingRanges = parseBindingRanges;
 exports.getClosestMultiLineCommentRange = getClosestMultiLineCommentRange;
 const collectBindings_1 = require("../utils/collectBindings");
 const shared_1 = require("../utils/shared");
-function parseBindingRanges(ts, ast) {
+function parseBindingRanges(ts, ast, componentExtsensions) {
     const bindings = [];
+    const components = [];
     ts.forEachChild(ast, node => {
         if (ts.isVariableStatement(node)) {
             for (const decl of node.declarationList.declarations) {
                 const ranges = (0, collectBindings_1.collectBindingRanges)(ts, decl.name, ast);
-                bindings.push(...ranges.map(range => ({ range })));
+                bindings.push(...ranges);
             }
         }
         else if (ts.isFunctionDeclaration(node)) {
             if (node.name && ts.isIdentifier(node.name)) {
-                bindings.push({
-                    range: _getStartEnd(node.name),
-                });
+                bindings.push(_getStartEnd(node.name));
             }
         }
         else if (ts.isClassDeclaration(node)) {
             if (node.name) {
-                bindings.push({
-                    range: _getStartEnd(node.name),
-                });
+                bindings.push(_getStartEnd(node.name));
             }
         }
         else if (ts.isEnumDeclaration(node)) {
-            bindings.push({
-                range: _getStartEnd(node.name),
-            });
+            bindings.push(_getStartEnd(node.name));
         }
         if (ts.isImportDeclaration(node)) {
             const moduleName = _getNodeText(node.moduleSpecifier).slice(1, -1);
             if (node.importClause && !node.importClause.isTypeOnly) {
                 const { name, namedBindings } = node.importClause;
                 if (name) {
-                    bindings.push({
-                        range: _getStartEnd(name),
-                        moduleName,
-                        isDefaultImport: true,
-                    });
+                    if (componentExtsensions.some(ext => moduleName.endsWith(ext))) {
+                        components.push(_getStartEnd(name));
+                    }
                 }
                 if (namedBindings) {
                     if (ts.isNamedImports(namedBindings)) {
@@ -49,25 +42,27 @@ function parseBindingRanges(ts, ast) {
                             if (element.isTypeOnly) {
                                 continue;
                             }
-                            bindings.push({
-                                range: _getStartEnd(element.name),
-                                moduleName,
-                                isDefaultImport: element.propertyName?.text === 'default',
-                            });
+                            if (element.propertyName
+                                && _getNodeText(element.propertyName) === 'default'
+                                && componentExtsensions.some(ext => moduleName.endsWith(ext))) {
+                                components.push(_getStartEnd(element.name));
+                            }
+                            else {
+                                bindings.push(_getStartEnd(element.name));
+                            }
                         }
                     }
                     else {
-                        bindings.push({
-                            range: _getStartEnd(namedBindings.name),
-                            moduleName,
-                            isNamespace: true,
-                        });
+                        bindings.push(_getStartEnd(namedBindings.name));
                     }
                 }
             }
         }
     });
-    return bindings;
+    return {
+        bindings,
+        components,
+    };
     function _getStartEnd(node) {
         return (0, shared_1.getStartEnd)(ts, node, ast);
     }

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

@@ -14,22 +14,14 @@ export declare const tsCodegen: WeakMap<Sfc, {
             name: import("../types").TextRange | undefined;
             inheritAttrs: string | undefined;
         } | undefined;
-        bindings: {
-            range: import("../types").TextRange;
-            moduleName?: string;
-            isDefaultImport?: boolean;
-            isNamespace?: boolean;
-        }[];
+        bindings: import("../types").TextRange[];
+        components: import("../types").TextRange[];
     } | undefined;
     getScriptSetupRanges: () => {
         leadingCommentEndOffset: number;
         importSectionEndOffset: number;
-        bindings: {
-            range: import("../types").TextRange;
-            moduleName?: string;
-            isDefaultImport?: boolean;
-            isNamespace?: boolean;
-        }[];
+        bindings: import("../types").TextRange[];
+        components: import("../types").TextRange[];
         defineModel: {
             localName?: import("../types").TextRange;
             name?: import("../types").TextRange;
@@ -188,7 +180,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
     } | undefined;
     getImportComponentNames: () => Set<string>;
     getSetupExposed: () => Set<string>;
-    getSetupConsts: () => Set<string>;
 }>;
 declare const plugin: VueLanguagePlugin;
 export default plugin;

package/lib/plugins/vue-tsx.js

@@ -61,7 +61,7 @@ function useCodegen(fileName, sfc, ctx) {
         return ctx.vueCompilerOptions;
     });
     const getScriptRanges = (0, alien_signals_1.computed)(() => sfc.script && validLangs.has(sfc.script.lang)
-        ? (0, scriptRanges_1.parseScriptRanges)(ts, sfc.script.ast, !!sfc.scriptSetup)
+        ? (0, scriptRanges_1.parseScriptRanges)(ts, sfc.script.ast, getResolvedOptions())
         : undefined);
     const getScriptSetupRanges = (0, alien_signals_1.computed)(() => sfc.scriptSetup && validLangs.has(sfc.scriptSetup.lang)
         ? (0, scriptSetupRanges_1.parseScriptSetupRanges)(ts, sfc.scriptSetup.ast, getResolvedOptions())
@@ -70,23 +70,13 @@ function useCodegen(fileName, sfc, ctx) {
         const names = new Set();
         const scriptSetupRanges = getScriptSetupRanges();
         if (sfc.scriptSetup && scriptSetupRanges) {
-            for (const { range, moduleName, isDefaultImport, isNamespace } of scriptSetupRanges.bindings) {
-                if (moduleName
-                    && isDefaultImport
-                    && !isNamespace
-                    && ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))) {
-                    names.add(sfc.scriptSetup.content.slice(range.start, range.end));
-                }
+            for (const range of scriptSetupRanges.components) {
+                names.add(sfc.scriptSetup.content.slice(range.start, range.end));
             }
             const scriptRange = getScriptRanges();
             if (sfc.script && scriptRange) {
-                for (const { range, moduleName, isDefaultImport, isNamespace } of scriptRange.bindings) {
-                    if (moduleName
-                        && isDefaultImport
-                        && !isNamespace
-                        && ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))) {
-                        names.add(sfc.script.content.slice(range.start, range.end));
-                    }
+                for (const range of scriptRange.components) {
+                    names.add(sfc.script.content.slice(range.start, range.end));
                 }
             }
         }
@@ -176,13 +166,13 @@ function useCodegen(fileName, sfc, ctx) {
         if (!sfc.scriptSetup || !scriptSetupRanges) {
             return allVars;
         }
-        for (const { range } of scriptSetupRanges.bindings) {
+        for (const range of scriptSetupRanges.bindings) {
             const name = sfc.scriptSetup.content.slice(range.start, range.end);
             allVars.add(name);
         }
         const scriptRanges = getScriptRanges();
         if (sfc.script && scriptRanges) {
-            for (const { range } of scriptRanges.bindings) {
+            for (const range of scriptRanges.bindings) {
                 const name = sfc.script.content.slice(range.start, range.end);
                 allVars.add(name);
             }
@@ -236,7 +226,6 @@ function useCodegen(fileName, sfc, ctx) {
         getGeneratedTemplate,
         getImportComponentNames,
         getSetupExposed,
-        getSetupConsts,
     };
 }
 //# sourceMappingURL=vue-tsx.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.1.6",
+	"version": "3.1.7",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -36,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "341c06897f7f46606dddb8dd6d9e74e9c7844f02"
+	"gitHead": "20dcd47c0cb4ce30e2c5e3ef1986ce297c218a06"
 }