@vue/language-core 2.2.2 → 2.2.4

package/lib/virtualFile/computedSfc.js

@@ -32,12 +32,8 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
         });
     });
     const getScript = computedNullableSfcBlock('script', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.script ?? undefined), (block, base) => {
-        const src = (0, alien_signals_1.computed)(() => block().src);
-        const srcOffset = (0, alien_signals_1.computed)(() => {
-            const _src = src();
-            return _src ? getUntrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_src) - base.startTagEnd : -1;
-        });
-        const ast = (0, alien_signals_1.computed)(() => {
+        const getSrc = computedAttrValue('__src', base, block);
+        const getAst = (0, alien_signals_1.computed)(() => {
             for (const plugin of plugins) {
                 const ast = plugin.compileSFCScript?.(base.lang, base.content);
                 if (ast) {
@@ -47,21 +43,13 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get src() { return src(); },
-            get srcOffset() { return srcOffset(); },
-            get ast() { return ast(); },
+            get src() { return getSrc(); },
+            get ast() { return getAst(); },
         });
     });
     const getOriginalScriptSetup = computedNullableSfcBlock('scriptSetup', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.scriptSetup ?? undefined), (block, base) => {
-        const generic = (0, alien_signals_1.computed)(() => {
-            const _block = block();
-            return typeof _block.attrs.generic === 'string' ? _block.attrs.generic : undefined;
-        });
-        const genericOffset = (0, alien_signals_1.computed)(() => {
-            const _generic = generic();
-            return _generic !== undefined ? getUntrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_generic) - base.startTagEnd : -1;
-        });
-        const ast = (0, alien_signals_1.computed)(() => {
+        const getGeneric = computedAttrValue('__generic', base, block);
+        const getAst = (0, alien_signals_1.computed)(() => {
             for (const plugin of plugins) {
                 const ast = plugin.compileSFCScript?.(base.lang, base.content);
                 if (ast) {
@@ -71,9 +59,8 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get generic() { return generic(); },
-            get genericOffset() { return genericOffset(); },
-            get ast() { return ast(); },
+            get generic() { return getGeneric(); },
+            get ast() { return getAst(); },
         });
     });
     const hasScript = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.script);
@@ -99,13 +86,7 @@ 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 getModule = (0, alien_signals_1.computed)(() => {
-            const { __module } = getBlock();
-            return __module ? {
-                name: __module.name,
-                offset: __module.offset ? base.start + __module.offset : undefined
-            } : undefined;
-        });
+        const getModule = computedAttrValue('__module', base, getBlock);
         const getScoped = (0, alien_signals_1.computed)(() => !!getBlock().scoped);
         const getCssVars = (0, alien_signals_1.computed)(() => [...(0, parseCssVars_1.parseCssVars)(base.content)]);
         const getClassNames = (0, alien_signals_1.computed)(() => [...(0, parseCssClassNames_1.parseCssClassNames)(base.content)]);
@@ -243,6 +224,18 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             get end() { return getEnd(); },
         };
     }
+    function computedAttrValue(key, base, getBlock) {
+        return (0, alien_signals_1.computed)(() => {
+            const val = getBlock()[key];
+            if (typeof val === 'object') {
+                return {
+                    ...val,
+                    offset: base.start + val.offset,
+                };
+            }
+            return val;
+        });
+    }
 }
 function mergeObject(a, b) {
     return Object.defineProperties(a, Object.getOwnPropertyDescriptors(b));

package/lib/virtualFile/vueFile.d.ts

@@ -10,17 +10,14 @@ export declare class VueVirtualCode implements VirtualCode {
     ts: typeof import('typescript');
     id: string;
     private _snapshot;
-    _vueSfc: () => import("@vue/compiler-sfc").SFCParseResult | undefined;
-    _sfc: import("../types").Sfc;
-    _mappings: () => {
-        sourceOffsets: number[];
-        generatedOffsets: number[];
-        lengths: number[];
-        data: import("@volar/language-core").CodeInformation;
-    }[];
-    _embeddedCodes: () => VirtualCode[];
-    get embeddedCodes(): VirtualCode[];
+    private _vueSfc;
+    private _sfc;
+    private _embeddedCodes;
+    private _mappings;
     get snapshot(): ts.IScriptSnapshot;
+    get vueSfc(): import("@vue/compiler-sfc").SFCParseResult | undefined;
+    get sfc(): import("../types").Sfc;
+    get embeddedCodes(): VirtualCode[];
     get mappings(): {
         sourceOffsets: number[];
         generatedOffsets: number[];

package/lib/virtualFile/vueFile.js

@@ -8,12 +8,18 @@ const computedSfc_1 = require("./computedSfc");
 const computedVueSfc_1 = require("./computedVueSfc");
 class VueVirtualCode {
     // others
-    get embeddedCodes() {
-        return this._embeddedCodes();
-    }
     get snapshot() {
         return this._snapshot();
     }
+    get vueSfc() {
+        return this._vueSfc();
+    }
+    get sfc() {
+        return this._sfc;
+    }
+    get embeddedCodes() {
+        return this._embeddedCodes();
+    }
     get mappings() {
         return this._mappings();
     }
@@ -30,6 +36,7 @@ class VueVirtualCode {
         // computeds
         this._vueSfc = (0, computedVueSfc_1.computedVueSfc)(this.plugins, this.fileName, this.languageId, this._snapshot);
         this._sfc = (0, computedSfc_1.computedSfc)(this.ts, this.plugins, this.fileName, this._snapshot, this._vueSfc);
+        this._embeddedCodes = (0, computedEmbeddedCodes_1.computedEmbeddedCodes)(this.plugins, this.fileName, this._sfc);
         this._mappings = (0, alien_signals_1.computed)(() => {
             const snapshot = this._snapshot();
             return [{
@@ -39,7 +46,6 @@ class VueVirtualCode {
                     data: plugins_1.allCodeFeatures,
                 }];
         });
-        this._embeddedCodes = (0, computedEmbeddedCodes_1.computedEmbeddedCodes)(this.plugins, this.fileName, this._sfc);
         this._snapshot(initSnapshot);
     }
     update(newSnapshot) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.2.2",
+	"version": "2.2.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "30757908b67f40f779c36795665163634fb81868"
+	"gitHead": "c28986596935cb43979c9d437c25f292bdb36cef"
 }

package/lib/codeFeatures.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/codeFeatures.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=codeFeatures.js.map

package/lib/codegen/common.d.ts

@@ -1,12 +0,0 @@
-import type * as ts from 'typescript';
-import type { Code, SfcBlock, VueCodeInformation } from '../types';
-export declare const newLine = "\n";
-export declare const endOfLine = ";\n";
-export declare const combineLastMapping: VueCodeInformation;
-export declare const variableNameRegex: RegExp;
-export declare function conditionWrapWith(condition: boolean, startOffset: number, endOffset: number, features: VueCodeInformation, ...wrapCodes: Code[]): Generator<Code>;
-export declare function wrapWith(startOffset: number, endOffset: number, features: VueCodeInformation, ...wrapCodes: Code[]): Generator<Code>;
-export declare function collectVars(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile, results?: string[]): string[];
-export declare function collectIdentifiers(ts: typeof import('typescript'), node: ts.Node, results?: [id: ts.Identifier, isRest: boolean][], isRest?: boolean): [id: ts.Identifier, isRest: boolean][];
-export declare function createTsAst(ts: typeof import('typescript'), astHolder: any, text: string): ts.SourceFile;
-export declare function generateSfcBlockSection(block: SfcBlock, start: number, end: number, features: VueCodeInformation): Code;

package/lib/codegen/common.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.variableNameRegex = exports.combineLastMapping = exports.endOfLine = exports.newLine = void 0;
-exports.conditionWrapWith = conditionWrapWith;
-exports.wrapWith = wrapWith;
-exports.collectVars = collectVars;
-exports.collectIdentifiers = collectIdentifiers;
-exports.createTsAst = createTsAst;
-exports.generateSfcBlockSection = generateSfcBlockSection;
-const scriptSetupRanges_1 = require("../parsers/scriptSetupRanges");
-exports.newLine = '\n';
-exports.endOfLine = `;${exports.newLine}`;
-exports.combineLastMapping = { __combineLastMapping: true };
-exports.variableNameRegex = /^[a-zA-Z_$][0-9a-zA-Z_$]*$/;
-function* conditionWrapWith(condition, startOffset, endOffset, features, ...wrapCodes) {
-    if (condition) {
-        yield* wrapWith(startOffset, endOffset, features, ...wrapCodes);
-    }
-    else {
-        for (const wrapCode of wrapCodes) {
-            yield wrapCode;
-        }
-    }
-}
-function* wrapWith(startOffset, endOffset, features, ...wrapCodes) {
-    yield ['', 'template', startOffset, features];
-    let offset = 1;
-    for (const wrapCode of wrapCodes) {
-        if (typeof wrapCode !== 'string') {
-            offset++;
-        }
-        yield wrapCode;
-    }
-    yield ['', 'template', endOffset, { __combineOffsetMapping: offset }];
-}
-function collectVars(ts, node, ast, results = []) {
-    const identifiers = collectIdentifiers(ts, node, []);
-    for (const [id] of identifiers) {
-        results.push((0, scriptSetupRanges_1.getNodeText)(ts, id, ast));
-    }
-    return results;
-}
-function collectIdentifiers(ts, node, results = [], isRest = false) {
-    if (ts.isIdentifier(node)) {
-        results.push([node, isRest]);
-    }
-    else if (ts.isObjectBindingPattern(node)) {
-        for (const el of node.elements) {
-            collectIdentifiers(ts, el.name, results, !!el.dotDotDotToken);
-        }
-    }
-    else if (ts.isArrayBindingPattern(node)) {
-        for (const el of node.elements) {
-            if (ts.isBindingElement(el)) {
-                collectIdentifiers(ts, el.name, results, !!el.dotDotDotToken);
-            }
-        }
-    }
-    else {
-        ts.forEachChild(node, node => collectIdentifiers(ts, node, results, false));
-    }
-    return results;
-}
-function createTsAst(ts, astHolder, text) {
-    if (astHolder.__volar_ast_text !== text) {
-        astHolder.__volar_ast_text = text;
-        astHolder.__volar_ast = ts.createSourceFile('/a.ts', text, 99);
-    }
-    return astHolder.__volar_ast;
-}
-function generateSfcBlockSection(block, start, end, features) {
-    return [
-        block.content.substring(start, end),
-        block.name,
-        start,
-        features,
-    ];
-}
-//# sourceMappingURL=common.js.map

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

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

package/lib/codegen/script/binding.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateBindings = generateBindings;
-const utils_1 = require("../utils");
-const component_1 = require("./component");
-const template_1 = require("./template");
-function* generateBindings(options, ctx, templateCodegenCtx) {
-    if (!options.sfc.scriptSetup || !options.scriptSetupRanges) {
-        return;
-    }
-    yield `const __VLS_bindings = {`;
-    if (ctx.bypassDefineComponent) {
-        yield* (0, component_1.generateComponentSetupReturns)(options.scriptSetupRanges);
-    }
-    const templateUsageVars = (0, template_1.getTemplateUsageVars)(options, ctx);
-    for (const [content, bindings] of [
-        [options.sfc.scriptSetup.content, options.scriptSetupRanges.bindings],
-        options.sfc.script && options.scriptRanges
-            ? [options.sfc.script.content, options.scriptRanges.bindings]
-            : ['', []],
-    ]) {
-        for (const { range } of bindings) {
-            const varName = content.slice(range.start, range.end);
-            if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
-                continue;
-            }
-            const templateOffset = options.getGeneratedLength();
-            yield `${varName}: ${varName} as typeof `;
-            const scriptOffset = options.getGeneratedLength();
-            yield `${varName},${utils_1.newLine}`;
-            options.linkedCodeMappings.push({
-                sourceOffsets: [scriptOffset],
-                generatedOffsets: [templateOffset],
-                lengths: [varName.length],
-                data: undefined,
-            });
-        }
-    }
-    yield `}${utils_1.endOfLine}`;
-}
-//# sourceMappingURL=binding.js.map

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

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

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

@@ -1,2 +0,0 @@
-import type { Code, VueCodeInformation } from '../../types';
-export declare function generateCamelized(code: string, offset: number, info: VueCodeInformation): Generator<Code>;

package/lib/codegen/template/camelized.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCamelized = generateCamelized;
-const shared_1 = require("@vue/shared");
-const common_1 = require("../common");
-function* generateCamelized(code, offset, info) {
-    const parts = code.split('-');
-    for (let i = 0; i < parts.length; i++) {
-        const part = parts[i];
-        if (part !== '') {
-            if (i === 0) {
-                yield [
-                    part,
-                    'template',
-                    offset,
-                    info,
-                ];
-            }
-            else {
-                yield [
-                    (0, shared_1.capitalize)(part),
-                    'template',
-                    offset,
-                    common_1.combineLastMapping,
-                ];
-            }
-        }
-        offset += part.length + 1;
-    }
-}
-//# sourceMappingURL=camelized.js.map

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

@@ -1,2 +0,0 @@
-import { Code, SfcBlockAttr, VueCodeInformation } from "../../types";
-export declare function generateSfcBlockSrc(src: SfcBlockAttr & object, text: string, features: VueCodeInformation): Generator<Code>;

package/lib/codegen/utils/src.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSfcBlockSrc = generateSfcBlockSrc;
-function* generateSfcBlockSrc(src, text, features) {
-    const { offset, quotes } = src;
-    if (!quotes) {
-        yield [``, 'main', offset, { verification: true }];
-    }
-    yield [
-        quotes ? text : `'${text}'`,
-        'main',
-        quotes ? offset : offset - 1,
-        features
-    ];
-    if (!quotes) {
-        yield [``, 'main', offset + text.length, { __combineOffsetMapping: 2 }];
-    }
-}
-//# sourceMappingURL=src.js.map

package/lib/plugins/vue-style-class-names.d.ts

@@ -1,5 +0,0 @@
-import type { VueLanguagePlugin } from '../types';
-export declare const commentReg: RegExp;
-declare const plugin: VueLanguagePlugin;
-export default plugin;
-export declare function fillBlank(css: string, ...regs: RegExp[]): string;

package/lib/plugins/vue-style-class-names.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.commentReg = void 0;
-exports.fillBlank = fillBlank;
-exports.commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
-const cssClassNameReg = /(?=(\.[a-z_][-\w]*)[\s.,+~>:#)[{])/gi;
-const fragmentReg = /(?<={)[^{]*(?=(?<!\\);)/g;
-const plugin = () => {
-    return {
-        version: 2.1,
-        resolveStyleReferenceLinks(block) {
-            const result = [];
-            const content = fillBlank(block.content, exports.commentReg, fragmentReg);
-            const matches = content.matchAll(cssClassNameReg);
-            for (const match of matches) {
-                const matchText = match[1];
-                if (matchText) {
-                    result.push({ text: matchText, offset: match.index });
-                }
-            }
-            return result;
-        },
-    };
-};
-exports.default = plugin;
-function fillBlank(css, ...regs) {
-    for (const reg of regs) {
-        css = css.replace(reg, match => ' '.repeat(match.length));
-    }
-    return css;
-}
-//# sourceMappingURL=vue-style-class-names.js.map

package/lib/plugins/vue-style-reference-link.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/plugins/vue-style-reference-link.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=vue-style-reference-link.js.map

package/lib/plugins/vue-style-reference-links.d.ts

@@ -1,3 +0,0 @@
-import type { VueLanguagePlugin } from '../types';
-declare const plugin: VueLanguagePlugin;
-export default plugin;

package/lib/plugins/vue-style-reference-links.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cssImportReg = /(?<=@import\s+url\()(["']?).*?\1(?=\))|(?<=@import\b\s*)(["']).*?\2/g;
-const plugin = () => {
-    return {
-        version: 2.1,
-        resolveStyleReferenceLinks(block) {
-            const result = [];
-            const matches = block.content.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) {
-                    result.push({ text, offset });
-                }
-            }
-            return result;
-        },
-    };
-};
-exports.default = plugin;
-//# sourceMappingURL=vue-style-reference-links.js.map

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

@@ -1,3 +0,0 @@
-import type { VueLanguagePlugin } from '../types';
-declare const plugin: VueLanguagePlugin;
-export default plugin;

package/lib/plugins/vue-vine.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_1 = require("./shared");
-const plugin = () => {
-    return {
-        version: 2.1,
-        getEmbeddedCodes(_fileName, sfc) {
-            const result = [];
-            for (let i = 0; i < sfc.customBlocks.length; i++) {
-                const block = sfc.customBlocks[i];
-                if (block.type === 'vine') {
-                    result.push({
-                        id: 'vine_' + i,
-                        lang: block.lang,
-                    });
-                }
-            }
-            return result;
-        },
-        resolveEmbeddedCode(_fileName, sfc, embeddedFile) {
-            if (embeddedFile.id.startsWith('vine_')) {
-                const index = parseInt(embeddedFile.id.slice('vine_'.length));
-                const block = sfc.customBlocks[index];
-                embeddedFile.content.push([
-                    block.content,
-                    block.name,
-                    0,
-                    shared_1.allCodeFeatures,
-                ]);
-            }
-        },
-    };
-};
-exports.default = plugin;
-//# sourceMappingURL=vue-vine.js.map

package/lib/utils/findDestructuredProps.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/utils/findDestructuredProps.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=findDestructuredProps.js.map

package/lib/utils/parseCssImports.d.ts

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

package/lib/utils/parseCssImports.js

@@ -1,19 +0,0 @@
-"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