@vue/language-core 3.0.2 → 3.0.3

package/lib/codegen/globalTypes.js

@@ -68,14 +68,6 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 			expose?: (exposed: T) => void,
 		}
 	};
-	type __VLS_NormalizeSlotReturns<S, R = NonNullable<S> extends (...args: any) => infer K ? K : any> = R extends any[] ? {
-		[K in keyof R]: R[K] extends infer V
-			? V extends Element ? V
-			: V extends new (...args: any) => infer R ? ReturnType<__VLS_FunctionalComponent<R>>
-			: V extends (...args: any) => infer R ? R
-			: any
-			: never
-	} : R;
 	type __VLS_IsFunction<T, K> = K extends keyof T
 		? __VLS_IsAny<T[K]> extends false
 		? unknown extends T[K]

package/lib/codegen/script/component.js

@@ -6,6 +6,7 @@ exports.generateEmitsOption = generateEmitsOption;
 exports.generatePropsOption = generatePropsOption;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
+const merge_1 = require("../utils/merge");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     if (options.sfc.script && options.scriptRanges?.exportDefault
         && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
@@ -17,14 +18,21 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
     }
     yield `setup() {${utils_1.newLine}`;
-    yield `return {${utils_1.newLine}`;
+    const returns = [];
     if (ctx.bypassDefineComponent) {
+        yield* `const __VLS_returns = {${utils_1.newLine}`;
         yield* generateComponentSetupReturns(scriptSetupRanges);
+        yield `}${utils_1.endOfLine}`;
+        returns.push(`typeof __VLS_returns`);
     }
     if (scriptSetupRanges.defineExpose) {
-        yield `...__VLS_exposed,${utils_1.newLine}`;
+        returns.push(`typeof __VLS_exposed`);
+    }
+    if (returns.length) {
+        yield `return {} as `;
+        yield* (0, merge_1.generateIntersectMerge)(returns);
+        yield utils_1.endOfLine;
     }
-    yield `}${utils_1.endOfLine}`;
     yield `},${utils_1.newLine}`;
     if (!ctx.bypassDefineComponent) {
         const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
@@ -77,10 +85,14 @@ function* generateEmitsOption(options, scriptSetupRanges) {
         }
     }
     if (options.vueCompilerOptions.target >= 3.5 && typeOptionCodes.length) {
-        yield* generateIntersectMerge('__typeEmits', typeOptionCodes);
+        yield `__typeEmits: {} as `;
+        yield* (0, merge_1.generateIntersectMerge)(typeOptionCodes);
+        yield `,${utils_1.newLine}`;
     }
     else if (optionCodes.length) {
-        yield* generateSpreadMerge('emits', optionCodes);
+        yield `emits: `;
+        yield* (0, merge_1.generateSpreadMerge)(optionCodes);
+        yield `,${utils_1.newLine}`;
     }
 }
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption, inheritAttrs) {
@@ -121,35 +133,14 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
             && scriptSetupRanges.withDefaults?.arg) {
             yield `__defaults: __VLS_withDefaultsArg,${utils_1.newLine}`;
         }
-        yield* generateSpreadMerge('__typeProps', typeOptionCodes);
+        yield `__typeProps: `;
+        yield* (0, merge_1.generateSpreadMerge)(typeOptionCodes);
+        yield `,${utils_1.newLine}`;
     }
     if (useOption) {
-        yield* generateSpreadMerge('props', getOptionCodes.map(fn => fn()));
-    }
-}
-function* generateIntersectMerge(key, codes) {
-    yield `${key}: {} as `;
-    yield codes[0];
-    for (let i = 1; i < codes.length; i++) {
-        yield ` & `;
-        yield codes[i];
-    }
-    yield `,${utils_1.newLine}`;
-}
-function* generateSpreadMerge(key, codes) {
-    yield `${key}: `;
-    if (codes.length === 1) {
-        yield codes[0];
-    }
-    else {
-        yield `{${utils_1.newLine}`;
-        for (const code of codes) {
-            yield `...`;
-            yield code;
-            yield `,${utils_1.newLine}`;
-        }
-        yield `}`;
+        yield `props: `;
+        yield* (0, merge_1.generateSpreadMerge)(getOptionCodes.map(fn => fn()));
+        yield `,${utils_1.newLine}`;
     }
-    yield `,${utils_1.newLine}`;
 }
 //# sourceMappingURL=component.js.map

package/lib/codegen/script/index.js

@@ -12,24 +12,7 @@ const src_1 = require("./src");
 const template_1 = require("./template");
 function* generateScript(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
-    if (options.vueCompilerOptions.globalTypesPath) {
-        const globalTypesPath = options.vueCompilerOptions.globalTypesPath;
-        if (path.isAbsolute(globalTypesPath)) {
-            let relativePath = path.relative(path.dirname(options.fileName), globalTypesPath);
-            if (relativePath !== globalTypesPath
-                && !relativePath.startsWith('./')
-                && !relativePath.startsWith('../')) {
-                relativePath = './' + relativePath;
-            }
-            yield `/// <reference types="${relativePath}" />${utils_1.newLine}`;
-        }
-        else {
-            yield `/// <reference types="${globalTypesPath}" />${utils_1.newLine}`;
-        }
-    }
-    else {
-        yield `/* placeholder */${utils_1.newLine}`;
-    }
+    yield* generateGlobalTypesPath(options);
     if (options.sfc.script?.src) {
         yield* (0, src_1.generateSrc)(options.sfc.script.src);
     }
@@ -112,6 +95,24 @@ function* generateScript(options) {
     }
     return ctx;
 }
+function* generateGlobalTypesPath(options) {
+    const globalTypesPath = options.vueCompilerOptions.globalTypesPath(options.fileName);
+    if (!globalTypesPath) {
+        yield `/* placeholder */${utils_1.newLine}`;
+    }
+    else if (path.isAbsolute(globalTypesPath)) {
+        let relativePath = path.relative(path.dirname(options.fileName), globalTypesPath);
+        if (relativePath !== globalTypesPath
+            && !relativePath.startsWith('./')
+            && !relativePath.startsWith('../')) {
+            relativePath = './' + relativePath;
+        }
+        yield `/// <reference types="${relativePath}" />${utils_1.newLine}`;
+    }
+    else {
+        yield `/// <reference types="${globalTypesPath}" />${utils_1.newLine}`;
+    }
+}
 function* generateScriptSectionPartiallyEnding(source, end, mark, delimiter = 'debugger') {
     yield delimiter;
     yield ['', source, end, codeFeatures_1.codeFeatures.verification];

package/lib/codegen/script/template.js

@@ -11,6 +11,7 @@ const context_1 = require("../template/context");
 const interpolation_1 = require("../template/interpolation");
 const styleScopedClasses_1 = require("../template/styleScopedClasses");
 const utils_1 = require("../utils");
+const merge_1 = require("../utils/merge");
 function* generateTemplate(options, ctx) {
     ctx.generatedTemplate = true;
     const templateCodegenCtx = (0, context_1.createTemplateCodegenContext)({
@@ -33,19 +34,8 @@ function* generateTemplateCtx(options) {
         exps.push(`{} as __VLS_StyleModules`);
     }
     yield `const __VLS_ctx = `;
-    if (exps.length === 1) {
-        yield exps[0];
-        yield `${utils_1.endOfLine}`;
-    }
-    else {
-        yield `{${utils_1.newLine}`;
-        for (const exp of exps) {
-            yield `...`;
-            yield exp;
-            yield `,${utils_1.newLine}`;
-        }
-        yield `}${utils_1.endOfLine}`;
-    }
+    yield* (0, merge_1.generateSpreadMerge)(exps);
+    yield utils_1.endOfLine;
 }
 function* generateTemplateElements() {
     yield `let __VLS_elements!: __VLS_IntrinsicElements${utils_1.endOfLine}`;
@@ -65,10 +55,7 @@ function* generateTemplateComponents(options) {
         types.push(`typeof __VLS_componentsOption`);
     }
     yield `type __VLS_LocalComponents =`;
-    for (const type of types) {
-        yield ` & `;
-        yield type;
-    }
+    yield* (0, merge_1.generateIntersectMerge)(types);
     yield utils_1.endOfLine;
     yield `let __VLS_components!: __VLS_LocalComponents & __VLS_GlobalComponents${utils_1.endOfLine}`;
 }
@@ -87,10 +74,7 @@ function* generateTemplateDirectives(options) {
         types.push(`__VLS_ResolveDirectives<typeof __VLS_directivesOption>`);
     }
     yield `type __VLS_LocalDirectives =`;
-    for (const type of types) {
-        yield ` & `;
-        yield type;
-    }
+    yield* (0, merge_1.generateIntersectMerge)(types);
     yield utils_1.endOfLine;
     yield `let __VLS_directives!: __VLS_LocalDirectives & __VLS_GlobalDirectives${utils_1.endOfLine}`;
 }

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

@@ -163,7 +163,6 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     }[]>;
     currentComponent: {
         ctxVar: string;
-        childTypes: string[];
         used: boolean;
     } | undefined;
     singleRootElTypes: string[];

package/lib/codegen/template/element.js

@@ -35,10 +35,8 @@ function* generateComponent(options, ctx, node) {
     const componentVNodeVar = ctx.getInternalVariable();
     const componentCtxVar = ctx.getInternalVariable();
     const isComponentTag = node.tag.toLowerCase() === 'component';
-    ctx.currentComponent?.childTypes.push(`typeof ${componentVNodeVar}`);
     ctx.currentComponent = {
         ctxVar: componentCtxVar,
-        childTypes: [],
         used: false,
     };
     let props = node.props;
@@ -196,7 +194,6 @@ function* generateElement(options, ctx, node) {
         ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
         : undefined;
     const failedPropExps = [];
-    ctx.currentComponent?.childTypes.push(`__VLS_NativeElements['${node.tag}']`);
     yield `__VLS_asFunctionalElement(__VLS_elements`;
     yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {

package/lib/codegen/template/vSlot.js

@@ -45,11 +45,6 @@ function* generateVSlot(options, ctx, node, slotDir) {
     for (const varName of slotBlockVars) {
         ctx.removeLocalVariable(varName);
     }
-    if (options.vueCompilerOptions.strictSlotChildren && node.children.length) {
-        yield `(): __VLS_NormalizeSlotReturns<typeof ${slotVar}> => (`;
-        yield* (0, wrapWith_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, ctx.codeFeatures.verification, `{} as [`, ...ctx.currentComponent.childTypes.map(name => `${name}, `), `]`);
-        yield `)${utils_1.endOfLine}`;
-    }
     if (slotDir) {
         let isStatic = true;
         if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {

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

@@ -0,0 +1,3 @@
+import type { Code } from '../../types';
+export declare function generateIntersectMerge(codes: Code[]): Generator<Code>;
+export declare function generateSpreadMerge(codes: Code[]): Generator<Code>;

package/lib/codegen/utils/merge.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateIntersectMerge = generateIntersectMerge;
+exports.generateSpreadMerge = generateSpreadMerge;
+const index_1 = require("./index");
+function* generateIntersectMerge(codes) {
+    yield codes[0];
+    for (let i = 1; i < codes.length; i++) {
+        yield ` & `;
+        yield codes[i];
+    }
+}
+function* generateSpreadMerge(codes) {
+    if (codes.length === 1) {
+        yield codes[0];
+    }
+    else {
+        yield `{${index_1.newLine}`;
+        for (const code of codes) {
+            yield `...`;
+            yield code;
+            yield `,${index_1.newLine}`;
+        }
+        yield `}`;
+    }
+}
+//# sourceMappingURL=merge.js.map

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

@@ -199,7 +199,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
         }[]>;
         currentComponent: {
             ctxVar: string;
-            childTypes: string[];
             used: boolean;
         } | undefined;
         singleRootElTypes: string[];

package/lib/types.d.ts

@@ -6,9 +6,10 @@ import type * as ts from 'typescript';
 import type { VueEmbeddedCode } from './virtualFile/embeddedFile';
 export type { SFCParseResult } from '@vue/compiler-sfc';
 export { VueEmbeddedCode };
-export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'plugins'>> & {
+export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'globalTypesPath' | 'plugins'>> & {
     strictTemplates?: boolean;
     target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
+    globalTypesPath?: string;
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {
@@ -19,12 +20,11 @@ export type Code = Segment<VueCodeInformation>;
 export interface VueCompilerOptions {
     target: number;
     lib: string;
-    globalTypesPath?: string;
+    globalTypesPath: (fileName: string) => string | undefined;
     extensions: string[];
     vitePressExtensions: string[];
     petiteVueExtensions: string[];
     jsxSlots: boolean;
-    strictSlotChildren: boolean;
     strictVModel: boolean;
     strictCssModules: boolean;
     checkUnknownProps: boolean;

package/lib/utils/ts.d.ts

@@ -10,12 +10,14 @@ export declare function createParsedCommandLine(ts: typeof import('typescript'),
 export declare class CompilerOptionsResolver {
     fileExists?: ((path: string) => boolean) | undefined;
     configRoots: Set<string>;
-    options: Omit<RawVueCompilerOptions, 'target' | 'plugin'>;
+    options: Omit<RawVueCompilerOptions, 'target' | 'globalTypesPath' | 'plugins'>;
     target: number | undefined;
     globalTypesPath: string | undefined;
     plugins: VueLanguagePlugin[];
     constructor(fileExists?: ((path: string) => boolean) | undefined);
     addConfig(options: RawVueCompilerOptions, rootDir: string): void;
     build(defaults?: VueCompilerOptions): VueCompilerOptions;
+    private findNodeModulesRoot;
 }
 export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean): VueCompilerOptions;
+export declare function writeGlobalTypes(vueOptions: VueCompilerOptions, writeFile: (fileName: string, data: string) => void): void;

package/lib/utils/ts.js

@@ -4,6 +4,7 @@ exports.CompilerOptionsResolver = void 0;
 exports.createParsedCommandLineByJson = createParsedCommandLineByJson;
 exports.createParsedCommandLine = createParsedCommandLine;
 exports.getDefaultCompilerOptions = getDefaultCompilerOptions;
+exports.writeGlobalTypes = writeGlobalTypes;
 const shared_1 = require("@vue/shared");
 const path_browserify_1 = require("path-browserify");
 const globalTypes_1 = require("../codegen/globalTypes");
@@ -179,24 +180,35 @@ class CompilerOptionsResolver {
             experimentalModelPropName: Object.fromEntries(Object.entries(this.options.experimentalModelPropName ?? defaults.experimentalModelPropName).map(([k, v]) => [(0, shared_1.camelize)(k), v])),
         };
         if (this.fileExists && this.globalTypesPath === undefined) {
-            root: for (const rootDir of [...this.configRoots].reverse()) {
-                let dir = rootDir;
-                while (!this.fileExists(path_browserify_1.posix.join(dir, 'node_modules', resolvedOptions.lib, 'package.json'))) {
-                    const parentDir = path_browserify_1.posix.dirname(dir);
-                    if (dir === parentDir) {
-                        continue root;
-                    }
-                    dir = parentDir;
+            const fileDirToGlobalTypesPath = new Map();
+            resolvedOptions.globalTypesPath = fileName => {
+                const fileDir = path_browserify_1.posix.dirname(fileName);
+                if (fileDirToGlobalTypesPath.has(fileDir)) {
+                    return fileDirToGlobalTypesPath.get(fileDir);
                 }
-                resolvedOptions.globalTypesPath = path_browserify_1.posix.join(dir, 'node_modules', '.vue-global-types', (0, globalTypes_1.getGlobalTypesFileName)(resolvedOptions));
-                break;
-            }
+                const root = this.findNodeModulesRoot(fileDir, resolvedOptions.lib);
+                const result = root
+                    ? path_browserify_1.posix.join(root, 'node_modules', '.vue-global-types', (0, globalTypes_1.getGlobalTypesFileName)(resolvedOptions))
+                    : undefined;
+                fileDirToGlobalTypesPath.set(fileDir, result);
+                return result;
+            };
         }
         else {
-            resolvedOptions.globalTypesPath = this.globalTypesPath;
+            resolvedOptions.globalTypesPath = () => this.globalTypesPath;
         }
         return resolvedOptions;
     }
+    findNodeModulesRoot(dir, lib) {
+        while (!this.fileExists(path_browserify_1.posix.join(dir, 'node_modules', lib, 'package.json'))) {
+            const parentDir = path_browserify_1.posix.dirname(dir);
+            if (dir === parentDir) {
+                return;
+            }
+            dir = parentDir;
+        }
+        return dir;
+    }
 }
 exports.CompilerOptionsResolver = CompilerOptionsResolver;
 function findVueVersion(rootDir) {
@@ -227,11 +239,11 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
     return {
         target,
         lib,
+        globalTypesPath: () => undefined,
         extensions: ['.vue'],
         vitePressExtensions: [],
         petiteVueExtensions: [],
         jsxSlots: false,
-        strictSlotChildren: strictTemplates,
         strictVModel: strictTemplates,
         strictCssModules: false,
         checkUnknownProps: strictTemplates,
@@ -287,4 +299,19 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         },
     };
 }
+function writeGlobalTypes(vueOptions, writeFile) {
+    const originalFn = vueOptions.globalTypesPath;
+    if (!originalFn) {
+        return;
+    }
+    const writed = new Set();
+    vueOptions.globalTypesPath = (fileName) => {
+        const result = originalFn(fileName);
+        if (result && !writed.has(result)) {
+            writed.add(result);
+            writeFile(result, (0, globalTypes_1.generateGlobalTypes)(vueOptions));
+        }
+        return result;
+    };
+}
 //# sourceMappingURL=ts.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.19",
+		"@volar/language-core": "2.4.20",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
@@ -26,7 +26,7 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
 		"@types/picomatch": "^4.0.0",
-		"@volar/typescript": "2.4.19",
+		"@volar/typescript": "2.4.20",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
 	"peerDependencies": {
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "7343119e9ca4f6a54f63b57f448f15df4b592a9a"
+	"gitHead": "129f30ff8d8d976abf0431063be5c6c4cf88f0fd"
 }