@vue/language-core 2.0.16 → 2.0.18

package/lib/plugins.js

@@ -19,6 +19,7 @@ const vue_sfc_customblocks_1 = require("./plugins/vue-sfc-customblocks");
 const vue_sfc_scripts_1 = require("./plugins/vue-sfc-scripts");
 const vue_sfc_styles_1 = require("./plugins/vue-sfc-styles");
 const vue_sfc_template_1 = require("./plugins/vue-sfc-template");
+const vue_script_js_1 = require("./plugins/vue-script-js");
 const vue_template_html_1 = require("./plugins/vue-template-html");
 const vue_template_inline_css_1 = require("./plugins/vue-template-inline-css");
 const vue_template_inline_ts_1 = require("./plugins/vue-template-inline-ts");
@@ -27,6 +28,7 @@ const types_1 = require("./types");
 __exportStar(require("./plugins/shared"), exports);
 function getBasePlugins(pluginContext) {
     const plugins = [
+        vue_script_js_1.default,
         vue_template_html_1.default,
         vue_template_inline_css_1.default,
         vue_template_inline_ts_1.default,

package/lib/types.d.ts

@@ -10,8 +10,6 @@ export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' |
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {
-    __referencesCodeLens?: boolean;
-    __displayWithLink?: boolean;
     __hint?: {
         setting: string;
         label: string;
@@ -48,7 +46,6 @@ export interface VueCompilerOptions {
     experimentalDefinePropProposal: 'kevinEdition' | 'johnsonEdition' | false;
     experimentalResolveStyleCssClasses: 'scoped' | 'always' | 'never';
     experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
-    experimentalUseElementAccessInTemplate: boolean;
 }
 export declare const pluginVersion = 2;
 export type VueLanguagePlugin = (ctx: {
@@ -71,6 +68,7 @@ export type VueLanguagePlugin = (ctx: {
         newText: string;
     }): SFCParseResult | undefined;
     resolveTemplateCompilerOptions?(options: CompilerDOM.CompilerOptions): CompilerDOM.CompilerOptions;
+    compileSFCScript?(lang: string, script: string): ts.SourceFile | undefined;
     compileSFCTemplate?(lang: string, template: string, options: CompilerDOM.CompilerOptions): CompilerDOM.CodegenResult | undefined;
     updateSFCTemplate?(oldResult: CompilerDOM.CodegenResult, textChange: {
         start: number;
@@ -124,18 +122,6 @@ export interface Sfc {
     customBlocks: readonly (SfcBlock & {
         type: string;
     })[];
-    /**
-     * @deprecated use `template.ast` instead
-     */
-    templateAst: CompilerDOM.RootNode | undefined;
-    /**
-     * @deprecated use `script.ast` instead
-     */
-    scriptAst: ts.SourceFile | undefined;
-    /**
-     * @deprecated use `scriptSetup.ast` instead
-     */
-    scriptSetupAst: ts.SourceFile | undefined;
 }
 export interface TextRange {
     start: number;

package/lib/utils/parseCssClassNames.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCssClassNames = void 0;
 const parseCssVars_1 = require("./parseCssVars");
-const cssClassNameReg = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\+\{\>#\:]{1})/g;
+const cssClassNameReg = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\,\+\{\>#\:]{1})/g;
 function* parseCssClassNames(styleContent) {
     styleContent = (0, parseCssVars_1.clearComments)(styleContent);
     const matches = styleContent.matchAll(cssClassNameReg);

package/lib/utils/ts.js

@@ -210,7 +210,6 @@ function resolveVueCompilerOptions(vueOptions) {
                 select: true
             }
         },
-        experimentalUseElementAccessInTemplate: vueOptions.experimentalUseElementAccessInTemplate ?? false,
     };
 }
 exports.resolveVueCompilerOptions = resolveVueCompilerOptions;

package/lib/virtualFile/computedSfc.js

@@ -25,7 +25,16 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             const _src = src();
             return _src ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_src) - base.startTagEnd : -1;
         });
-        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, 99));
+        const ast = (0, computeds_1.computed)(() => {
+            for (const plugin of plugins) {
+                const ast = plugin.compileSFCScript?.(base.lang, base.content);
+                if (ast) {
+                    return ast;
+                    ;
+                }
+            }
+            return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
+        });
         return mergeObject(base, {
             get src() { return src(); },
             get srcOffset() { return srcOffset(); },
@@ -41,7 +50,16 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
             const _generic = generic();
             return _generic !== undefined ? untrackedSnapshot().getText(0, base.startTagEnd).lastIndexOf(_generic) - base.startTagEnd : -1;
         });
-        const ast = (0, computeds_1.computed)(() => ts.createSourceFile(fileName + '.' + base.lang, base.content, 99));
+        const ast = (0, computeds_1.computed)(() => {
+            for (const plugin of plugins) {
+                const ast = plugin.compileSFCScript?.(base.lang, base.content);
+                if (ast) {
+                    return ast;
+                    ;
+                }
+            }
+            return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
+        });
         return mergeObject(base, {
             get generic() { return generic(); },
             get genericOffset() { return genericOffset(); },
@@ -95,9 +113,6 @@ function computedSfc(ts, plugins, fileName, snapshot, parsed) {
         get scriptSetup() { return scriptSetup(); },
         get styles() { return styles; },
         get customBlocks() { return customBlocks; },
-        get templateAst() { return template()?.ast; },
-        get scriptAst() { return script()?.ast; },
-        get scriptSetupAst() { return scriptSetup()?.ast; },
     };
     function computedTemplateAst(base) {
         let cache;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.16",
+	"version": "2.0.18",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.2.0",
+		"@volar/language-core": "~2.2.4",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "95b78c38cbf75481ebb59e11956b592346f01d92"
+	"gitHead": "7aac2805f03b17e4c624335f509d502002bb75a8"
 }