@vue/language-core 2.2.8 → 3.0.0-alpha.2

package/lib/plugins/vue-tsx.js

@@ -12,7 +12,7 @@ const vueCompilerOptions_1 = require("../parsers/vueCompilerOptions");
 const signals_1 = require("../utils/signals");
 const ts_1 = require("../utils/ts");
 exports.tsCodegen = new WeakMap();
-const fileEditTimes = new Map();
+const validLangs = new Set(['js', 'jsx', 'ts', 'tsx']);
 const plugin = ctx => {
     let appendedGlobalTypes = false;
     return {
@@ -23,11 +23,10 @@ const plugin = ctx => {
         ],
         getEmbeddedCodes(fileName, sfc) {
             const codegen = useCodegen(fileName, sfc);
-            const files = [];
-            if (['js', 'ts', 'jsx', 'tsx'].includes(codegen.getLang())) {
-                files.push({ id: 'script_' + codegen.getLang(), lang: codegen.getLang() });
-            }
-            return files;
+            return [{
+                    id: 'script_' + codegen.getLang(),
+                    lang: codegen.getLang(),
+                }];
         },
         resolveEmbeddedCode(fileName, sfc, embeddedFile) {
             if (/script_(js|jsx|ts|tsx)/.test(embeddedFile.id)) {
@@ -54,11 +53,23 @@ const plugin = ctx => {
 exports.default = plugin;
 function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
     const ts = ctx.modules.typescript;
+    const getRawLang = (0, alien_signals_1.computed)(() => {
+        if (sfc.script && sfc.scriptSetup) {
+            if (sfc.scriptSetup.lang !== 'js') {
+                return sfc.scriptSetup.lang;
+            }
+            else {
+                return sfc.script.lang;
+            }
+        }
+        return sfc.scriptSetup?.lang ?? sfc.script?.lang;
+    });
     const getLang = (0, alien_signals_1.computed)(() => {
-        return !sfc.script && !sfc.scriptSetup ? 'ts'
-            : sfc.scriptSetup && sfc.scriptSetup.lang !== 'js' ? sfc.scriptSetup.lang
-                : sfc.script && sfc.script.lang !== 'js' ? sfc.script.lang
-                    : 'js';
+        const rawLang = getRawLang();
+        if (rawLang && validLangs.has(rawLang)) {
+            return rawLang;
+        }
+        return 'ts';
     });
     const getResolvedOptions = (0, alien_signals_1.computed)(() => {
         const options = (0, vueCompilerOptions_1.parseVueCompilerOptions)(sfc.comments);
@@ -69,13 +80,13 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
         }
         return ctx.vueCompilerOptions;
     });
-    const getScriptRanges = (0, alien_signals_1.computed)(() => sfc.script
+    const getScriptRanges = (0, alien_signals_1.computed)(() => sfc.script && validLangs.has(sfc.script.lang)
         ? (0, scriptRanges_1.parseScriptRanges)(ts, sfc.script.ast, !!sfc.scriptSetup, false)
         : undefined);
-    const getScriptSetupRanges = (0, alien_signals_1.computed)(() => sfc.scriptSetup
+    const getScriptSetupRanges = (0, alien_signals_1.computed)(() => sfc.scriptSetup && validLangs.has(sfc.scriptSetup.lang)
         ? (0, scriptSetupRanges_1.parseScriptSetupRanges)(ts, sfc.scriptSetup.ast, getResolvedOptions())
         : undefined);
-    const getSetupBindingNames = (0, signals_1.computedSet)((0, alien_signals_1.computed)(() => {
+    const getSetupBindingNames = (0, signals_1.computedSet)(() => {
         const newNames = new Set();
         const bindings = getScriptSetupRanges()?.bindings;
         if (sfc.scriptSetup && bindings) {
@@ -84,8 +95,8 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             }
         }
         return newNames;
-    }));
-    const getSetupImportComponentNames = (0, signals_1.computedSet)((0, alien_signals_1.computed)(() => {
+    });
+    const getSetupImportComponentNames = (0, signals_1.computedSet)(() => {
         const newNames = new Set();
         const bindings = getScriptSetupRanges()?.bindings;
         if (sfc.scriptSetup && bindings) {
@@ -99,21 +110,21 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             }
         }
         return newNames;
-    }));
-    const getSetupDestructuredPropNames = (0, signals_1.computedSet)((0, alien_signals_1.computed)(() => {
+    });
+    const getSetupDestructuredPropNames = (0, signals_1.computedSet)(() => {
         const newNames = new Set(getScriptSetupRanges()?.defineProps?.destructured?.keys());
         const rest = getScriptSetupRanges()?.defineProps?.destructuredRest;
         if (rest) {
             newNames.add(rest);
         }
         return newNames;
-    }));
-    const getSetupTemplateRefNames = (0, signals_1.computedSet)((0, alien_signals_1.computed)(() => {
+    });
+    const getSetupTemplateRefNames = (0, signals_1.computedSet)(() => {
         const newNames = new Set(getScriptSetupRanges()?.useTemplateRef
             .map(({ name }) => name)
             .filter(name => name !== undefined));
         return newNames;
-    }));
+    });
     const setupHasDefineSlots = (0, alien_signals_1.computed)(() => !!getScriptSetupRanges()?.defineSlots);
     const getSetupSlotsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineSlots?.name);
     const getSetupPropsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineProps?.name);
@@ -144,7 +155,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             compilerOptions: ctx.compilerOptions,
             vueCompilerOptions: getResolvedOptions(),
             template: sfc.template,
-            edited: getResolvedOptions().__test || (fileEditTimes.get(fileName) ?? 0) >= 2,
             scriptSetupBindingNames: getSetupBindingNames(),
             scriptSetupImportComponentNames: getSetupImportComponentNames(),
             destructuredPropNames: getSetupDestructuredPropNames(),
@@ -173,7 +183,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             compilerOptions: ctx.compilerOptions,
             vueCompilerOptions: getResolvedOptions(),
             sfc: sfc,
-            edited: getResolvedOptions().__test || (fileEditTimes.get(fileName) ?? 0) >= 2,
             fileName,
             lang: getLang(),
             scriptRanges: getScriptRanges(),
@@ -183,7 +192,6 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
             templateRefNames: getSetupTemplateRefNames(),
             appendGlobalTypes,
         });
-        fileEditTimes.set(fileName, (fileEditTimes.get(fileName) ?? 0) + 1);
         let current = codegen.next();
         while (!current.done) {
             const code = current.value;

package/lib/types.d.ts

@@ -8,7 +8,7 @@ export type { SFCParseResult } from '@vue/compiler-sfc';
 export { VueEmbeddedCode };
 export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'plugins'>> & {
     strictTemplates?: boolean;
-    target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 99 | number;
+    target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {
@@ -23,6 +23,7 @@ export interface VueCompilerOptions {
     vitePressExtensions: string[];
     petiteVueExtensions: string[];
     jsxSlots: boolean;
+    strictVModel: boolean;
     checkUnknownProps: boolean;
     checkUnknownEvents: boolean;
     checkUnknownDirectives: boolean;
@@ -61,7 +62,6 @@ export interface VueCompilerOptions {
     __setupedGlobalTypes?: true | {
         absolutePath: string;
     };
-    __test?: boolean;
 }
 export declare const validVersions: readonly [2, 2.1];
 export type VueLanguagePluginReturn = {

package/lib/utils/forEachElementNode.d.ts

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

package/lib/utils/forEachElementNode.js

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

package/lib/utils/shared.d.ts

@@ -1,3 +1,7 @@
-export declare function getSlotsPropertyName(vueVersion: number): "$scopedSlots" | "$slots";
+import type * as ts from 'typescript';
+import type { TextRange } from '../types';
 export { hyphenate as hyphenateTag } from '@vue/shared';
 export declare function hyphenateAttr(str: string): string;
+export declare function getSlotsPropertyName(vueVersion: number): "$scopedSlots" | "$slots";
+export declare function getStartEnd(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): TextRange;
+export declare function getNodeText(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): string;

package/lib/utils/shared.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hyphenateTag = void 0;
-exports.getSlotsPropertyName = getSlotsPropertyName;
 exports.hyphenateAttr = hyphenateAttr;
+exports.getSlotsPropertyName = getSlotsPropertyName;
+exports.getStartEnd = getStartEnd;
+exports.getNodeText = getNodeText;
 const shared_1 = require("@vue/shared");
-function getSlotsPropertyName(vueVersion) {
-    return vueVersion < 3 ? '$scopedSlots' : '$slots';
-}
 var shared_2 = require("@vue/shared");
 Object.defineProperty(exports, "hyphenateTag", { enumerable: true, get: function () { return shared_2.hyphenate; } });
 function hyphenateAttr(str) {
@@ -17,4 +16,17 @@ function hyphenateAttr(str) {
     }
     return hyphencase;
 }
+function getSlotsPropertyName(vueVersion) {
+    return vueVersion < 3 ? '$scopedSlots' : '$slots';
+}
+function getStartEnd(ts, node, ast) {
+    return {
+        start: ts.getTokenPosOfNode(node, ast),
+        end: node.end,
+    };
+}
+function getNodeText(ts, node, ast) {
+    const { start, end } = getStartEnd(ts, node, ast);
+    return ast.text.slice(start, end);
+}
 //# sourceMappingURL=shared.js.map

package/lib/utils/ts.d.ts

@@ -16,10 +16,6 @@ export declare class CompilerOptionsResolver {
     build(defaults?: VueCompilerOptions): VueCompilerOptions;
 }
 export declare function getDefaultCompilerOptions(target?: number, lib?: string, strictTemplates?: boolean): VueCompilerOptions;
-/**
- * @deprecated use `getDefaultCompilerOptions` instead
- */
-export declare function resolveVueCompilerOptions(options: Partial<VueCompilerOptions>): VueCompilerOptions;
 export declare function setupGlobalTypes(rootDir: string, vueOptions: VueCompilerOptions, host: {
     fileExists(path: string): boolean;
     writeFile?(path: string, data: string): void;

package/lib/utils/ts.js

@@ -4,7 +4,6 @@ exports.CompilerOptionsResolver = void 0;
 exports.createParsedCommandLineByJson = createParsedCommandLineByJson;
 exports.createParsedCommandLine = createParsedCommandLine;
 exports.getDefaultCompilerOptions = getDefaultCompilerOptions;
-exports.resolveVueCompilerOptions = resolveVueCompilerOptions;
 exports.setupGlobalTypes = setupGlobalTypes;
 const shared_1 = require("@vue/shared");
 const path_browserify_1 = require("path-browserify");
@@ -218,6 +217,7 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         vitePressExtensions: [],
         petiteVueExtensions: [],
         jsxSlots: false,
+        strictVModel: strictTemplates,
         checkUnknownProps: strictTemplates,
         checkUnknownEvents: strictTemplates,
         checkUnknownDirectives: strictTemplates,
@@ -271,15 +271,6 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         },
     };
 }
-/**
- * @deprecated use `getDefaultCompilerOptions` instead
- */
-function resolveVueCompilerOptions(options) {
-    return {
-        ...getDefaultCompilerOptions(options.target, options.lib),
-        ...options,
-    };
-}
 function setupGlobalTypes(rootDir, vueOptions, host) {
     if (!host.writeFile) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.2.8",
+	"version": "3.0.0-alpha.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "cdf00e6f19971260607ea2347924b94126a254fc"
+	"gitHead": "79247b7c24b7202ec676723440fdb36c38e6d450"
 }