@vue/language-core 2.0.13 → 2.0.14

package/lib/virtualFile/computedMappings.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedMappings = void 0;
 const language_core_1 = require("@volar/language-core");
 const computeds_1 = require("computeds");
-const utils_1 = require("../generators/utils");
+const shared_1 = require("../plugins/shared");
 function computedMappings(snapshot, sfc) {
     return (0, computeds_1.computed)(() => {
-        const str = [[snapshot().getText(0, snapshot().getLength()), undefined, 0, (0, utils_1.enableAllFeatures)({})]];
+        const str = [[snapshot().getText(0, snapshot().getLength()), undefined, 0, shared_1.allCodeFeatures]];
         for (const block of [
             sfc.script,
             sfc.scriptSetup,
@@ -55,7 +55,7 @@ function computedMappings(snapshot, sfc) {
                     sourceOffsets: offsets,
                     generatedOffsets: offsets,
                     lengths: offsets.map(() => 0),
-                    data: (0, utils_1.disableAllFeatures)({ structure: true }),
+                    data: { structure: true },
                 });
             }
         }

package/lib/virtualFile/computedSfc.js

@@ -32,7 +32,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             get ast() { return ast(); },
         });
     });
-    const scriptSetup = computedNullableSfcBlock('scriptSetup', 'js', (0, computeds_1.computed)(() => parsed()?.descriptor.scriptSetup ?? undefined), (block, base) => {
+    const scriptSetupOriginal = computedNullableSfcBlock('scriptSetup', 'js', (0, computeds_1.computed)(() => parsed()?.descriptor.scriptSetup ?? undefined), (block, base) => {
         const generic = (0, computeds_1.computed)(() => {
             const _block = block();
             return typeof _block.attrs.generic === 'string' ? _block.attrs.generic : undefined;
@@ -48,6 +48,27 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             get ast() { return ast(); },
         });
     });
+    const hasScript = (0, computeds_1.computed)(() => !!parsed()?.descriptor.script);
+    const hasScriptSetup = (0, computeds_1.computed)(() => !!parsed()?.descriptor.scriptSetup);
+    const scriptSetup = (0, computeds_1.computed)(() => {
+        if (!hasScript() && !hasScriptSetup()) {
+            //#region monkey fix: https://github.com/vuejs/language-tools/pull/2113
+            return {
+                content: '',
+                lang: 'ts',
+                name: '',
+                start: 0,
+                end: 0,
+                startTagEnd: 0,
+                endTagStart: 0,
+                generic: undefined,
+                genericOffset: 0,
+                attrs: {},
+                ast: ts.createSourceFile('', '', 99, false, ts.ScriptKind.TS),
+            };
+        }
+        return scriptSetupOriginal();
+    });
     const styles = (0, computeds_1.computedArray)((0, computeds_1.computed)(() => parsed()?.descriptor.styles ?? []), (block, i) => {
         const base = computedSfcBlock('style_' + i, 'css', block);
         const module = (0, computeds_1.computed)(() => typeof block().module === 'string' ? block().module : block().module ? '$style' : undefined);

package/lib/virtualFile/embeddedFile.d.ts

@@ -1,12 +1,11 @@
-import type { Mapping, StackNode } from '@volar/language-core';
+import type { Mapping } from '@volar/language-core';
 import type { Code } from '../types';
 export declare class VueEmbeddedCode {
     id: string;
     lang: string;
     content: Code[];
-    contentStacks: StackNode[];
     parentCodeId?: string;
     linkedCodeMappings: Mapping[];
     embeddedCodes: VueEmbeddedCode[];
-    constructor(id: string, lang: string, content: Code[], contentStacks: StackNode[]);
+    constructor(id: string, lang: string, content: Code[]);
 }

package/lib/virtualFile/embeddedFile.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VueEmbeddedCode = void 0;
 class VueEmbeddedCode {
-    constructor(id, lang, content, contentStacks) {
+    constructor(id, lang, content) {
         this.id = id;
         this.lang = lang;
         this.content = content;
-        this.contentStacks = contentStacks;
         this.linkedCodeMappings = [];
         this.embeddedCodes = [];
     }

package/lib/virtualFile/vueFile.d.ts

@@ -1,25 +1,23 @@
-import type { Stack, VirtualCode } from '@volar/language-core';
+import type { VirtualCode } from '@volar/language-core';
 import { Signal } from 'computeds';
 import type * as ts from 'typescript';
 import type { VueCompilerOptions, VueLanguagePlugin } from '../types';
-export declare class VueGeneratedCode implements VirtualCode {
+export declare class VueVirtualCode implements VirtualCode {
     fileName: string;
     languageId: string;
     initSnapshot: ts.IScriptSnapshot;
     vueCompilerOptions: VueCompilerOptions;
     plugins: ReturnType<VueLanguagePlugin>[];
     ts: typeof import('typescript');
-    codegenStack: boolean;
     id: string;
     _snapshot: Signal<ts.IScriptSnapshot>;
     getVueSfc: () => import("@vue/compiler-sfc").SFCParseResult | undefined;
     sfc: import("../types").Sfc;
     getMappings: () => import("@volar/language-core").CodeMapping[];
     getEmbeddedCodes: () => VirtualCode[];
-    codegenStacks: Stack[];
     get embeddedCodes(): VirtualCode[];
     get snapshot(): ts.IScriptSnapshot;
     get mappings(): import("@volar/language-core").CodeMapping[];
-    constructor(fileName: string, languageId: string, initSnapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: ReturnType<VueLanguagePlugin>[], ts: typeof import('typescript'), codegenStack: boolean);
+    constructor(fileName: string, languageId: string, initSnapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: ReturnType<VueLanguagePlugin>[], ts: typeof import('typescript'));
     update(newSnapshot: ts.IScriptSnapshot): void;
 }

package/lib/virtualFile/vueFile.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VueGeneratedCode = void 0;
+exports.VueVirtualCode = void 0;
 const computeds_1 = require("computeds");
 const computedFiles_1 = require("./computedFiles");
 const computedMappings_1 = require("./computedMappings");
 const computedSfc_1 = require("./computedSfc");
 const computedVueSfc_1 = require("./computedVueSfc");
-class VueGeneratedCode {
+class VueVirtualCode {
+    // others
     get embeddedCodes() {
         return this.getEmbeddedCodes();
     }
@@ -16,28 +17,25 @@ class VueGeneratedCode {
     get mappings() {
         return this.getMappings();
     }
-    constructor(fileName, languageId, initSnapshot, vueCompilerOptions, plugins, ts, codegenStack) {
+    constructor(fileName, languageId, initSnapshot, vueCompilerOptions, plugins, ts) {
         this.fileName = fileName;
         this.languageId = languageId;
         this.initSnapshot = initSnapshot;
         this.vueCompilerOptions = vueCompilerOptions;
         this.plugins = plugins;
         this.ts = ts;
-        this.codegenStack = codegenStack;
         // sources
         this.id = 'main';
         // computeds
         this.getVueSfc = (0, computedVueSfc_1.computedVueSfc)(this.plugins, this.fileName, () => this._snapshot());
         this.sfc = (0, computedSfc_1.computedSfc)(this.ts, this.plugins, this.fileName, () => this._snapshot(), this.getVueSfc);
         this.getMappings = (0, computedMappings_1.computedMappings)(() => this._snapshot(), this.sfc);
-        this.getEmbeddedCodes = (0, computedFiles_1.computedFiles)(this.plugins, this.fileName, this.sfc, this.codegenStack);
-        // others
-        this.codegenStacks = [];
+        this.getEmbeddedCodes = (0, computedFiles_1.computedFiles)(this.plugins, this.fileName, this.sfc);
         this._snapshot = (0, computeds_1.signal)(initSnapshot);
     }
     update(newSnapshot) {
         this._snapshot.set(newSnapshot);
     }
 }
-exports.VueGeneratedCode = VueGeneratedCode;
+exports.VueVirtualCode = VueVirtualCode;
 //# sourceMappingURL=vueFile.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.13",
+	"version": "2.0.14",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.8",
+		"@volar/language-core": "2.2.0-alpha.10",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "591d019acd0d34e390880d69b31fbc7b794b806b"
+	"gitHead": "ce1412067f88b7f9af03a2d3e04c220b4921c363"
 }

package/lib/generators/globalTypes.js

@@ -1,135 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGlobalTypes = void 0;
-const shared_1 = require("../utils/shared");
-function generateGlobalTypes(vueCompilerOptions) {
-    const fnPropsType = `(K extends { $props: infer Props } ? Props : any)${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}`;
-    return `
-; export const __VLS_globalTypesStart = {};
-declare global {
-// @ts-ignore
-type __VLS_IntrinsicElements = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.IntrinsicElements, __VLS_PickNotAny<globalThis.JSX.IntrinsicElements, Record<string, any>>>;
-// @ts-ignore
-type __VLS_Element = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.Element, globalThis.JSX.Element>;
-// @ts-ignore
-type __VLS_GlobalComponents = ${[
-        `__VLS_PickNotAny<import('vue').GlobalComponents, {}>`,
-        `__VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>`,
-        `__VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>`,
-        `Pick<typeof import('${vueCompilerOptions.lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>`
-    ].join(' & ')};
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
-
-const __VLS_intrinsicElements: __VLS_IntrinsicElements;
-
-// v-for
-function __VLS_getVForSourceType(source: number): [number, number, number][];
-function __VLS_getVForSourceType(source: string): [string, number, number][];
-function __VLS_getVForSourceType<T extends any[]>(source: T): [
-	item: T[number],
-	key: number,
-	index: number,
-][];
-function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
-	item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
-	key: number,
-	index: undefined,
-][];
-// #3845
-function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
-	item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
-	key: number,
-	index: undefined,
-][];
-function __VLS_getVForSourceType<T>(source: T): [
-	item: T[keyof T],
-	key: keyof T,
-	index: number,
-][];
-
-// @ts-ignore
-function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
-// @ts-ignore
-function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
-function __VLS_directiveFunction<T>(dir: T):
-	T extends import('${vueCompilerOptions.lib}').ObjectDirective<infer E, infer V> | import('${vueCompilerOptions.lib}').FunctionDirective<infer E, infer V> ? (value: V) => void
-	: T;
-function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
-function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
-
-type __VLS_SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
-type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
-	N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
-	N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
-	N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
-	N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
-	N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
-	N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
-	${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: unknown }'}
-
-type __VLS_FillingEventArg_ParametersLength<E extends (...args: any) => any> = __VLS_IsAny<Parameters<E>> extends true ? -1 : Parameters<E>['length'];
-type __VLS_FillingEventArg<E> = E extends (...args: any) => any ? __VLS_FillingEventArg_ParametersLength<E> extends 0 ? ($event?: undefined) => ReturnType<E> : E : E;
-function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
-	T extends new (...args: any) => any
-	? (props: ${fnPropsType}, ctx?: any) => __VLS_Element & { __ctx?: {
-		attrs?: any,
-		slots?: K extends { ${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: infer Slots } ? Slots : any,
-		emit?: K extends { $emit: infer Emit } ? Emit : any
-	} & { props?: ${fnPropsType}; expose?(exposed: K): void; } }
-	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
-	: T extends (...args: any) => any ? T
-	: (_: {}${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } };
-function __VLS_elementAsFunctionalComponent<T>(t: T): (_: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'} } };
-function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): Parameters<T>['length'] extends 2 ? [any] : [];
-function __VLS_pickEvent<E1, E2>(emitEvent: E1, propEvent: E2): __VLS_FillingEventArg<
-	__VLS_PickNotAny<
-		__VLS_AsFunctionOrAny<E2>,
-		__VLS_AsFunctionOrAny<E1>
-	>
-> | undefined;
-function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): __VLS_PickNotAny<
-	'__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_FunctionalComponentProps<T, K> =
-	'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
-	: T extends (props: infer P, ...args: any) => any ? P :
-	{};
-type __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
-
-function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
-
-/**
- * emit
- */
-// fix https://github.com/vuejs/language-tools/issues/926
-type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
-type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
-	? U extends T
-	? never
-	: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
-	: never;
-type __VLS_OverloadUnion<T> = Exclude<
-	__VLS_OverloadUnionInner<(() => never) & T>,
-	T extends () => never ? never : () => never
->;
-type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
-	? F extends (event: infer E, ...args: infer A) => any
-	? { [K in E & string]: (...args: A) => void; }
-	: never
-	: never;
-type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
-	__VLS_UnionToIntersection<
-		__VLS_ConstructorOverloads<T> & {
-			[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
-		}
-	>
->;
-type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
-}
-export const __VLS_globalTypesEnd = {};`;
-}
-exports.generateGlobalTypes = generateGlobalTypes;
-;
-//# sourceMappingURL=globalTypes.js.map

package/lib/generators/inlineCss.d.ts

@@ -1,3 +0,0 @@
-import * as CompilerDOM from '@vue/compiler-dom';
-import type { Code } from '../types';
-export declare function generate(templateAst: NonNullable<CompilerDOM.RootNode>): Generator<Code>;

package/lib/generators/inlineCss.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const CompilerDOM = require("@vue/compiler-dom");
-const template_1 = require("./template");
-const utils_1 = require("./utils");
-const codeFeatures = (0, utils_1.enableAllFeatures)({
-    format: false,
-    structure: false,
-});
-function* generate(templateAst) {
-    for (const node of (0, template_1.forEachElementNode)(templateAst)) {
-        for (const prop of node.props) {
-            if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-                && prop.name === 'bind'
-                && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
-                && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
-                && prop.arg.content === 'style'
-                && prop.exp.constType === CompilerDOM.ConstantTypes.CAN_STRINGIFY) {
-                const endCrt = prop.arg.loc.source[prop.arg.loc.source.length - 1]; // " | '
-                const start = prop.arg.loc.source.indexOf(endCrt) + 1;
-                const end = prop.arg.loc.source.lastIndexOf(endCrt);
-                const content = prop.arg.loc.source.substring(start, end);
-                yield `x { `;
-                yield [
-                    content,
-                    'template',
-                    prop.arg.loc.start.offset + start,
-                    codeFeatures,
-                ];
-                yield ` }\n`;
-            }
-        }
-    }
-}
-exports.generate = generate;
-//# sourceMappingURL=inlineCss.js.map

package/lib/generators/script.d.ts

@@ -1,13 +0,0 @@
-import type { Mapping } from '@volar/language-core';
-import type * as ts from 'typescript';
-import type { ScriptRanges } from '../parsers/scriptRanges';
-import type { ScriptSetupRanges } from '../parsers/scriptSetupRanges';
-import type { Code, CodeAndStack, Sfc, VueCompilerOptions } from '../types';
-export declare function generate(ts: typeof import('typescript'), fileName: string, script: Sfc['script'], scriptSetup: Sfc['scriptSetup'], styles: Sfc['styles'], // TODO: computed it
-lang: string, scriptRanges: ScriptRanges | undefined, scriptSetupRanges: ScriptSetupRanges | undefined, templateCodegen: {
-    tsCodes: Code[];
-    tsCodegenStacks: string[];
-    tagNames: Set<string>;
-    accessedGlobalVariables: Set<string>;
-    hasSlot: boolean;
-} | undefined, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, globalTypesHolder: string | undefined, getGeneratedLength: () => number, linkedCodeMappings: Mapping<any>[] | undefined, codegenStack: boolean): Generator<CodeAndStack>;