@vue/language-core 2.1.10 → 2.2.0

package/lib/utils/ts.js

@@ -6,8 +6,8 @@ exports.resolveVueCompilerOptions = resolveVueCompilerOptions;
 exports.setupGlobalTypes = setupGlobalTypes;
 const shared_1 = require("@vue/shared");
 const path_browserify_1 = require("path-browserify");
-const languagePlugin_1 = require("../languagePlugin");
 const globalTypes_1 = require("../codegen/globalTypes");
+const languagePlugin_1 = require("../languagePlugin");
 function createParsedCommandLineByJson(ts, parseConfigHost, rootDir, json, configFileName = rootDir + '/jsconfig.json', skipGlobalTypesSetup = false) {
     const proxyHost = proxyParseConfigHostForExtendConfigPaths(parseConfigHost);
     ts.parseJsonConfigFileContent(json, proxyHost.host, rootDir, {}, configFileName);
@@ -168,25 +168,24 @@ function getPartialVueCompilerOptions(ts, tsConfigSourceFile) {
         }
     }
 }
-function resolveVueCompilerOptions(vueOptions) {
-    const target = vueOptions.target ?? 3.3;
-    const lib = vueOptions.lib ?? 'vue';
+function getDefaultOptions(options) {
+    const target = options.target ?? 3.3;
+    const lib = options.lib ?? 'vue';
     return {
-        ...vueOptions,
         target,
-        extensions: vueOptions.extensions ?? ['.vue'],
-        vitePressExtensions: vueOptions.vitePressExtensions ?? [],
-        petiteVueExtensions: vueOptions.petiteVueExtensions ?? [],
         lib,
-        jsxSlots: vueOptions.jsxSlots ?? false,
-        strictTemplates: vueOptions.strictTemplates ?? false,
-        skipTemplateCodegen: vueOptions.skipTemplateCodegen ?? false,
-        fallthroughAttributes: vueOptions.fallthroughAttributes ?? false,
-        dataAttributes: vueOptions.dataAttributes ?? [],
-        htmlAttributes: vueOptions.htmlAttributes ?? ['aria-*'],
-        optionsWrapper: vueOptions.optionsWrapper ?? (target >= 2.7
+        extensions: ['.vue'],
+        vitePressExtensions: [],
+        petiteVueExtensions: [],
+        jsxSlots: false,
+        strictTemplates: false,
+        skipTemplateCodegen: false,
+        fallthroughAttributes: false,
+        dataAttributes: [],
+        htmlAttributes: ['aria-*'],
+        optionsWrapper: target >= 2.7
             ? [`(await import('${lib}')).defineComponent(`, `)`]
-            : [`(await import('${lib}')).default.extend(`, `)`]),
+            : [`(await import('${lib}')).default.extend(`, `)`],
         macros: {
             defineProps: ['defineProps'],
             defineSlots: ['defineSlots'],
@@ -195,20 +194,35 @@ function resolveVueCompilerOptions(vueOptions) {
             defineModel: ['defineModel'],
             defineOptions: ['defineOptions'],
             withDefaults: ['withDefaults'],
-            ...vueOptions.macros,
         },
-        composibles: {
+        composables: {
+            useAttrs: ['useAttrs'],
             useCssModule: ['useCssModule'],
+            useSlots: ['useSlots'],
             useTemplateRef: ['useTemplateRef', 'templateRef'],
-            ...vueOptions.composibles,
         },
-        plugins: vueOptions.plugins ?? [],
-        // experimental
-        experimentalDefinePropProposal: vueOptions.experimentalDefinePropProposal ?? false,
-        experimentalResolveStyleCssClasses: vueOptions.experimentalResolveStyleCssClasses ?? 'scoped',
+        plugins: [],
+        experimentalDefinePropProposal: false,
+        experimentalResolveStyleCssClasses: 'scoped',
+        experimentalModelPropName: null
+    };
+}
+;
+function resolveVueCompilerOptions(options, defaults = getDefaultOptions(options)) {
+    return {
+        ...defaults,
+        ...options,
+        macros: {
+            ...defaults.macros,
+            ...options.macros,
+        },
+        composables: {
+            ...defaults.composables,
+            ...options.composables,
+        },
         // https://github.com/vuejs/vue-next/blob/master/packages/compiler-dom/src/transforms/vModel.ts#L49-L51
         // https://vuejs.org/guide/essentials/forms.html#form-input-bindings
-        experimentalModelPropName: Object.fromEntries(Object.entries(vueOptions.experimentalModelPropName ?? {
+        experimentalModelPropName: Object.fromEntries(Object.entries(options.experimentalModelPropName ?? defaults.experimentalModelPropName ?? {
             '': {
                 input: true
             },

package/lib/virtualFile/computedEmbeddedCodes.d.ts

@@ -1,5 +1,4 @@
 import type { VirtualCode } from '@volar/language-core';
-import { ISignal } from 'alien-signals';
 import type { Sfc, VueLanguagePluginReturn } from '../types';
-export declare function computedEmbeddedCodes(plugins: VueLanguagePluginReturn[], fileName: string, sfc: Sfc): ISignal<VirtualCode[]>;
+export declare function computedEmbeddedCodes(plugins: VueLanguagePluginReturn[], fileName: string, sfc: Sfc): import("alien-signals").Computed<VirtualCode[]>;
 export declare function resolveCommonLanguageId(lang: string): string;

package/lib/virtualFile/computedSfc.js

@@ -6,15 +6,24 @@ const parseCssClassNames_1 = require("../utils/parseCssClassNames");
 const parseCssVars_1 = require("../utils/parseCssVars");
 function computedSfc(ts, plugins, fileName, snapshot, parsed) {
     const untrackedSnapshot = () => {
-        const prevTrackId = alien_signals_1.System.activeTrackId;
-        alien_signals_1.System.activeTrackId = 0;
+        const prevSub = alien_signals_1.activeSub;
+        const prevTrackId = alien_signals_1.activeTrackId;
+        (0, alien_signals_1.setActiveSub)(undefined, 0);
         const res = snapshot.get();
-        alien_signals_1.System.activeTrackId = prevTrackId;
+        (0, alien_signals_1.setActiveSub)(prevSub, prevTrackId);
         return res;
     };
     const content = (0, alien_signals_1.computed)(() => {
         return snapshot.get().getText(0, snapshot.get().getLength());
     });
+    const comments = (0, alien_signals_1.computed)(oldValue => {
+        const newValue = parsed.get()?.descriptor.comments ?? [];
+        if (oldValue?.length === newValue.length
+            && 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 compiledAst = computedTemplateAst(base);
         return mergeObject(base, {
@@ -89,13 +98,13 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
         }
         return scriptSetupOriginal.get();
     });
-    const styles = alien_signals_1.Unstable.computedArray((0, alien_signals_1.computed)(() => parsed.get()?.descriptor.styles ?? []), (block, i) => {
+    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().module;
-            return _module ? {
-                name: _module.name,
-                offset: _module.offset ? base.start + _module.offset : undefined
+            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);
@@ -108,7 +117,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             get classNames() { return classNames.get(); },
         });
     });
-    const customBlocks = alien_signals_1.Unstable.computedArray((0, alien_signals_1.computed)(() => parsed.get()?.descriptor.customBlocks ?? []), (block, i) => {
+    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);
         return () => mergeObject(base, {
@@ -117,6 +126,7 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
     });
     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(); },
@@ -137,10 +147,11 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             if (cache?.plugin.updateSFCTemplate) {
                 const change = untrackedSnapshot().getChangeRange(cache.snapshot);
                 if (change) {
-                    const prevTrackId = alien_signals_1.System.activeTrackId;
-                    alien_signals_1.System.activeTrackId = 0;
+                    const prevSub = alien_signals_1.activeSub;
+                    const prevTrackId = alien_signals_1.activeTrackId;
+                    (0, alien_signals_1.setActiveSub)(undefined, 0);
                     const templateOffset = base.startTagEnd;
-                    alien_signals_1.System.activeTrackId = prevTrackId;
+                    (0, alien_signals_1.setActiveSub)(prevSub, prevTrackId);
                     const newText = untrackedSnapshot().getText(change.span.start, change.span.start + change.newLength);
                     const newResult = cache.plugin.updateSFCTemplate(cache.result, {
                         start: change.span.start - templateOffset,

package/lib/virtualFile/computedVueSfc.d.ts

@@ -2,4 +2,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").ISignal<SFCParseResult | undefined>;
+export declare function computedVueSfc(plugins: VueLanguagePluginReturn[], fileName: string, languageId: string, snapshot: Signal<ts.IScriptSnapshot>): import("alien-signals").Computed<SFCParseResult | undefined>;

package/lib/virtualFile/vueFile.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.1.10",
+	"version": "2.2.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,11 +13,11 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.8",
+		"@volar/language-core": "~2.4.11",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
-		"alien-signals": "^0.2.0",
+		"alien-signals": "^0.4.9",
 		"minimatch": "^9.0.3",
 		"muggle-string": "^0.4.1",
 		"path-browserify": "^1.0.1"
@@ -26,7 +26,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/typescript": "~2.4.8",
+		"@volar/typescript": "~2.4.11",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
 	"peerDependencies": {
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "b0af30caee2f8dfb1a8393c1b400f38e31fa4883"
+	"gitHead": "5babca774658d4b9afbe877ac7c8cafdaecf2c3e"
 }

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