@vue/language-core 2.2.0 → 2.2.4

package/lib/virtualFile/computedSfc.js

@@ -4,41 +4,36 @@ exports.computedSfc = computedSfc;
 const alien_signals_1 = require("alien-signals");
 const parseCssClassNames_1 = require("../utils/parseCssClassNames");
 const parseCssVars_1 = require("../utils/parseCssVars");
-function computedSfc(ts, plugins, fileName, snapshot, parsed) {
-    const untrackedSnapshot = () => {
-        const prevSub = alien_signals_1.activeSub;
-        const prevTrackId = alien_signals_1.activeTrackId;
-        (0, alien_signals_1.setActiveSub)(undefined, 0);
-        const res = snapshot.get();
-        (0, alien_signals_1.setActiveSub)(prevSub, prevTrackId);
+const signals_1 = require("../utils/signals");
+function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
+    const getUntrackedSnapshot = () => {
+        (0, alien_signals_1.pauseTracking)();
+        const res = getSnapshot();
+        (0, alien_signals_1.resumeTracking)();
         return res;
     };
-    const content = (0, alien_signals_1.computed)(() => {
-        return snapshot.get().getText(0, snapshot.get().getLength());
+    const getContent = (0, alien_signals_1.computed)(() => {
+        return getSnapshot().getText(0, getSnapshot().getLength());
     });
-    const comments = (0, alien_signals_1.computed)(oldValue => {
-        const newValue = parsed.get()?.descriptor.comments ?? [];
+    const getComments = (0, alien_signals_1.computed)(oldValue => {
+        const newValue = getParseResult()?.descriptor.comments ?? [];
         if (oldValue?.length === newValue.length
-            && oldValue.every((v, i) => v === newValue[i])) {
+            && oldValue?.every((v, i) => v === newValue[i])) {
             return oldValue;
         }
         return newValue;
     });
-    const template = computedNullableSfcBlock('template', 'html', (0, alien_signals_1.computed)(() => parsed.get()?.descriptor.template ?? undefined), (_block, base) => {
+    const getTemplate = computedNullableSfcBlock('template', 'html', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.template ?? undefined), (_block, base) => {
         const compiledAst = computedTemplateAst(base);
         return mergeObject(base, {
-            get ast() { return compiledAst.get()?.ast; },
-            get errors() { return compiledAst.get()?.errors; },
-            get warnings() { return compiledAst.get()?.warnings; },
+            get ast() { return compiledAst()?.ast; },
+            get errors() { return compiledAst()?.errors; },
+            get warnings() { return compiledAst()?.warnings; },
         });
     });
-    const script = computedNullableSfcBlock('script', 'js', (0, alien_signals_1.computed)(() => parsed.get()?.descriptor.script ?? undefined), (block, base) => {
-        const src = (0, alien_signals_1.computed)(() => block.get().src);
-        const srcOffset = (0, alien_signals_1.computed)(() => {
-            const _src = src.get();
-            return _src ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_src) - base.startTagEnd : -1;
-        });
-        const ast = (0, alien_signals_1.computed)(() => {
+    const getScript = computedNullableSfcBlock('script', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.script ?? undefined), (block, base) => {
+        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) {
@@ -48,21 +43,13 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get src() { return src.get(); },
-            get srcOffset() { return srcOffset.get(); },
-            get ast() { return ast.get(); },
+            get src() { return getSrc(); },
+            get ast() { return getAst(); },
         });
     });
-    const scriptSetupOriginal = computedNullableSfcBlock('scriptSetup', 'js', (0, alien_signals_1.computed)(() => parsed.get()?.descriptor.scriptSetup ?? undefined), (block, base) => {
-        const generic = (0, alien_signals_1.computed)(() => {
-            const _block = block.get();
-            return typeof _block.attrs.generic === 'string' ? _block.attrs.generic : undefined;
-        });
-        const genericOffset = (0, alien_signals_1.computed)(() => {
-            const _generic = generic.get();
-            return _generic !== undefined ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_generic) - base.startTagEnd : -1;
-        });
-        const ast = (0, alien_signals_1.computed)(() => {
+    const getOriginalScriptSetup = computedNullableSfcBlock('scriptSetup', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.scriptSetup ?? undefined), (block, base) => {
+        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) {
@@ -72,15 +59,14 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get generic() { return generic.get(); },
-            get genericOffset() { return genericOffset.get(); },
-            get ast() { return ast.get(); },
+            get generic() { return getGeneric(); },
+            get ast() { return getAst(); },
         });
     });
-    const hasScript = (0, alien_signals_1.computed)(() => !!parsed.get()?.descriptor.script);
-    const hasScriptSetup = (0, alien_signals_1.computed)(() => !!parsed.get()?.descriptor.scriptSetup);
-    const scriptSetup = (0, alien_signals_1.computed)(() => {
-        if (!hasScript.get() && !hasScriptSetup.get()) {
+    const hasScript = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.script);
+    const hasScriptSetup = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.scriptSetup);
+    const getScriptSetup = (0, alien_signals_1.computed)(() => {
+        if (!hasScript() && !hasScriptSetup()) {
             //#region monkey fix: https://github.com/vuejs/language-tools/pull/2113
             return {
                 content: '',
@@ -96,40 +82,34 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
                 ast: ts.createSourceFile('', '', 99, false, ts.ScriptKind.TS),
             };
         }
-        return scriptSetupOriginal.get();
+        return getOriginalScriptSetup();
     });
-    const styles = alien_signals_1.unstable.computedArray((0, alien_signals_1.computed)(() => parsed.get()?.descriptor.styles ?? []), (block, i) => {
-        const base = computedSfcBlock('style_' + i, 'css', block);
-        const module = (0, alien_signals_1.computed)(() => {
-            const { __module } = block.get();
-            return __module ? {
-                name: __module.name,
-                offset: __module.offset ? base.start + __module.offset : undefined
-            } : undefined;
-        });
-        const scoped = (0, alien_signals_1.computed)(() => !!block.get().scoped);
-        const cssVars = (0, alien_signals_1.computed)(() => [...(0, parseCssVars_1.parseCssVars)(base.content)]);
-        const classNames = (0, alien_signals_1.computed)(() => [...(0, parseCssClassNames_1.parseCssClassNames)(base.content)]);
+    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 = 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)]);
         return () => mergeObject(base, {
-            get module() { return module.get(); },
-            get scoped() { return scoped.get(); },
-            get cssVars() { return cssVars.get(); },
-            get classNames() { return classNames.get(); },
+            get module() { return getModule(); },
+            get scoped() { return getScoped(); },
+            get cssVars() { return getCssVars(); },
+            get classNames() { return getClassNames(); },
         });
     });
-    const customBlocks = alien_signals_1.unstable.computedArray((0, alien_signals_1.computed)(() => parsed.get()?.descriptor.customBlocks ?? []), (block, i) => {
-        const base = computedSfcBlock('custom_block_' + i, 'txt', block);
-        const type = (0, alien_signals_1.computed)(() => block.get().type);
+    const customBlocks = (0, signals_1.computedArray)((0, alien_signals_1.computed)(() => getParseResult()?.descriptor.customBlocks ?? []), (getBlock, i) => {
+        const base = computedSfcBlock('custom_block_' + i, 'txt', getBlock);
+        const getType = (0, alien_signals_1.computed)(() => getBlock().type);
         return () => mergeObject(base, {
-            get type() { return type.get(); },
+            get type() { return getType(); },
         });
     });
     return {
-        get content() { return content.get(); },
-        get comments() { return comments.get(); },
-        get template() { return template.get(); },
-        get script() { return script.get(); },
-        get scriptSetup() { return scriptSetup.get(); },
+        get content() { return getContent(); },
+        get comments() { return getComments(); },
+        get template() { return getTemplate(); },
+        get script() { return getScript(); },
+        get scriptSetup() { return getScriptSetup(); },
         get styles() { return styles; },
         get customBlocks() { return customBlocks; },
     };
@@ -145,14 +125,12 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             }
             // incremental update
             if (cache?.plugin.updateSFCTemplate) {
-                const change = untrackedSnapshot().getChangeRange(cache.snapshot);
+                const change = getUntrackedSnapshot().getChangeRange(cache.snapshot);
                 if (change) {
-                    const prevSub = alien_signals_1.activeSub;
-                    const prevTrackId = alien_signals_1.activeTrackId;
-                    (0, alien_signals_1.setActiveSub)(undefined, 0);
+                    (0, alien_signals_1.pauseTracking)();
                     const templateOffset = base.startTagEnd;
-                    (0, alien_signals_1.setActiveSub)(prevSub, prevTrackId);
-                    const newText = untrackedSnapshot().getText(change.span.start, change.span.start + change.newLength);
+                    (0, alien_signals_1.resumeTracking)();
+                    const newText = getUntrackedSnapshot().getText(change.span.start, change.span.start + change.newLength);
                     const newResult = cache.plugin.updateSFCTemplate(cache.result, {
                         start: change.span.start - templateOffset,
                         end: change.span.start + change.span.length - templateOffset,
@@ -160,7 +138,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
                     });
                     if (newResult) {
                         cache.template = base.content;
-                        cache.snapshot = untrackedSnapshot();
+                        cache.snapshot = getUntrackedSnapshot();
                         cache.result = newResult;
                         return {
                             errors: [],
@@ -195,7 +173,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
                     if (result && !errors.length && !warnings.length) {
                         cache = {
                             template: base.content,
-                            snapshot: untrackedSnapshot(),
+                            snapshot: getUntrackedSnapshot(),
                             result: result,
                             plugin,
                         };
@@ -217,35 +195,47 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             };
         });
     }
-    function computedNullableSfcBlock(name, defaultLang, block, resolve) {
-        const hasBlock = (0, alien_signals_1.computed)(() => !!block.get());
+    function computedNullableSfcBlock(name, defaultLang, getBlock, resolve) {
+        const hasBlock = (0, alien_signals_1.computed)(() => !!getBlock());
         return (0, alien_signals_1.computed)(() => {
-            if (!hasBlock.get()) {
+            if (!hasBlock()) {
                 return;
             }
-            const _block = (0, alien_signals_1.computed)(() => block.get());
+            const _block = (0, alien_signals_1.computed)(() => getBlock());
             return resolve(_block, computedSfcBlock(name, defaultLang, _block));
         });
     }
-    function computedSfcBlock(name, defaultLang, block) {
-        const lang = (0, alien_signals_1.computed)(() => block.get().lang ?? defaultLang);
-        const attrs = (0, alien_signals_1.computed)(() => block.get().attrs); // TODO: computed it
-        const content = (0, alien_signals_1.computed)(() => block.get().content);
-        const startTagEnd = (0, alien_signals_1.computed)(() => block.get().loc.start.offset);
-        const endTagStart = (0, alien_signals_1.computed)(() => block.get().loc.end.offset);
-        const start = (0, alien_signals_1.computed)(() => untrackedSnapshot().getText(0, startTagEnd.get()).lastIndexOf('<' + block.get().type));
-        const end = (0, alien_signals_1.computed)(() => endTagStart.get() + untrackedSnapshot().getText(endTagStart.get(), untrackedSnapshot().getLength()).indexOf('>') + 1);
+    function computedSfcBlock(name, defaultLang, getBlock) {
+        const getLang = (0, alien_signals_1.computed)(() => getBlock().lang ?? defaultLang);
+        const getAttrs = (0, alien_signals_1.computed)(() => getBlock().attrs); // TODO: computed it
+        const getContent = (0, alien_signals_1.computed)(() => getBlock().content);
+        const getStartTagEnd = (0, alien_signals_1.computed)(() => getBlock().loc.start.offset);
+        const getEndTagStart = (0, alien_signals_1.computed)(() => getBlock().loc.end.offset);
+        const getStart = (0, alien_signals_1.computed)(() => getUntrackedSnapshot().getText(0, getStartTagEnd()).lastIndexOf('<' + getBlock().type));
+        const getEnd = (0, alien_signals_1.computed)(() => getEndTagStart() + getUntrackedSnapshot().getText(getEndTagStart(), getUntrackedSnapshot().getLength()).indexOf('>') + 1);
         return {
             name,
-            get lang() { return lang.get(); },
-            get attrs() { return attrs.get(); },
-            get content() { return content.get(); },
-            get startTagEnd() { return startTagEnd.get(); },
-            get endTagStart() { return endTagStart.get(); },
-            get start() { return start.get(); },
-            get end() { return end.get(); },
+            get lang() { return getLang(); },
+            get attrs() { return getAttrs(); },
+            get content() { return getContent(); },
+            get startTagEnd() { return getStartTagEnd(); },
+            get endTagStart() { return getEndTagStart(); },
+            get start() { return getStart(); },
+            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/computedVueSfc.d.ts

@@ -1,5 +1,4 @@
 import type { SFCParseResult } from '@vue/compiler-sfc';
-import { Signal } from 'alien-signals';
 import type * as ts from 'typescript';
 import type { VueLanguagePluginReturn } from '../types';
-export declare function computedVueSfc(plugins: VueLanguagePluginReturn[], fileName: string, languageId: string, snapshot: Signal<ts.IScriptSnapshot>): import("alien-signals").Computed<SFCParseResult | undefined>;
+export declare function computedVueSfc(plugins: VueLanguagePluginReturn[], fileName: string, languageId: string, getSnapshot: () => ts.IScriptSnapshot): () => SFCParseResult | undefined;

package/lib/virtualFile/computedVueSfc.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computedVueSfc = computedVueSfc;
 const alien_signals_1 = require("alien-signals");
-function computedVueSfc(plugins, fileName, languageId, snapshot) {
+function computedVueSfc(plugins, fileName, languageId, getSnapshot) {
     let cache;
     return (0, alien_signals_1.computed)(() => {
         // incremental update
         if (cache?.plugin.updateSFC) {
-            const change = snapshot.get().getChangeRange(cache.snapshot);
+            const change = getSnapshot().getChangeRange(cache.snapshot);
             if (change) {
                 const newSfc = cache.plugin.updateSFC(cache.sfc, {
                     start: change.span.start,
                     end: change.span.start + change.span.length,
-                    newText: snapshot.get().getText(change.span.start, change.span.start + change.newLength),
+                    newText: getSnapshot().getText(change.span.start, change.span.start + change.newLength),
                 });
                 if (newSfc) {
-                    cache.snapshot = snapshot.get();
+                    cache.snapshot = getSnapshot();
                     // force dirty
                     cache.sfc = JSON.parse(JSON.stringify(newSfc));
                     return cache.sfc;
@@ -23,12 +23,12 @@ function computedVueSfc(plugins, fileName, languageId, snapshot) {
             }
         }
         for (const plugin of plugins) {
-            const sfc = plugin.parseSFC?.(fileName, snapshot.get().getText(0, snapshot.get().getLength()))
-                ?? plugin.parseSFC2?.(fileName, languageId, snapshot.get().getText(0, snapshot.get().getLength()));
+            const sfc = plugin.parseSFC?.(fileName, getSnapshot().getText(0, getSnapshot().getLength()))
+                ?? plugin.parseSFC2?.(fileName, languageId, getSnapshot().getText(0, getSnapshot().getLength()));
             if (sfc) {
                 if (!sfc.errors.length) {
                     cache = {
-                        snapshot: snapshot.get(),
+                        snapshot: getSnapshot(),
                         sfc,
                         plugin,
                     };

package/lib/virtualFile/vueFile.d.ts

@@ -9,18 +9,15 @@ export declare class VueVirtualCode implements VirtualCode {
     plugins: VueLanguagePluginReturn[];
     ts: typeof import('typescript');
     id: string;
-    _snapshot: import("alien-signals").Signal<ts.IScriptSnapshot>;
-    _vueSfc: import("alien-signals").Computed<import("@vue/compiler-sfc").SFCParseResult | undefined>;
-    _sfc: import("../types").Sfc;
-    _mappings: import("alien-signals").Computed<{
-        sourceOffsets: number[];
-        generatedOffsets: number[];
-        lengths: number[];
-        data: import("@volar/language-core").CodeInformation;
-    }[]>;
-    _embeddedCodes: import("alien-signals").Computed<VirtualCode[]>;
-    get embeddedCodes(): VirtualCode[];
+    private _snapshot;
+    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,14 +8,20 @@ const computedSfc_1 = require("./computedSfc");
 const computedVueSfc_1 = require("./computedVueSfc");
 class VueVirtualCode {
     // others
-    get embeddedCodes() {
-        return this._embeddedCodes.get();
-    }
     get snapshot() {
-        return this._snapshot.get();
+        return this._snapshot();
+    }
+    get vueSfc() {
+        return this._vueSfc();
+    }
+    get sfc() {
+        return this._sfc;
+    }
+    get embeddedCodes() {
+        return this._embeddedCodes();
     }
     get mappings() {
-        return this._mappings.get();
+        return this._mappings();
     }
     constructor(fileName, languageId, initSnapshot, vueCompilerOptions, plugins, ts) {
         this.fileName = fileName;
@@ -30,8 +36,9 @@ 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.get();
+            const snapshot = this._snapshot();
             return [{
                     sourceOffsets: [0],
                     generatedOffsets: [0],
@@ -39,11 +46,10 @@ class VueVirtualCode {
                     data: plugins_1.allCodeFeatures,
                 }];
         });
-        this._embeddedCodes = (0, computedEmbeddedCodes_1.computedEmbeddedCodes)(this.plugins, this.fileName, this._sfc);
-        this._snapshot.set(initSnapshot);
+        this._snapshot(initSnapshot);
     }
     update(newSnapshot) {
-        this._snapshot.set(newSnapshot);
+        this._snapshot(newSnapshot);
     }
 }
 exports.VueVirtualCode = VueVirtualCode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.2.0",
+	"version": "2.2.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -17,14 +17,14 @@
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
-		"alien-signals": "^0.4.9",
+		"alien-signals": "^1.0.3",
 		"minimatch": "^9.0.3",
 		"muggle-string": "^0.4.1",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/minimatch": "^5.1.2",
-		"@types/node": "latest",
+		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
 		"@volar/typescript": "~2.4.11",
 		"@vue/compiler-sfc": "^3.5.0"
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "5babca774658d4b9afbe877ac7c8cafdaecf2c3e"
+	"gitHead": "c28986596935cb43979c9d437c25f292bdb36cef"
 }

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

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