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

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

@@ -138,6 +138,17 @@ export declare const tsCodegen: WeakMap<Sfc, {
     };
     getGeneratedTemplate: () => {
         codes: Code[];
+        currentInfo: {
+            ignoreError?: boolean;
+            expectError?: {
+                token: number;
+                node: import("@vue/compiler-dom").CommentNode;
+            };
+            generic?: {
+                content: string;
+                offset: number;
+            };
+        };
         codeFeatures: {
             all: import("../types").VueCodeInformation;
             none: import("../types").VueCodeInformation;
@@ -157,6 +168,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             withoutHighlightAndCompletionAndNavigation: import("../types").VueCodeInformation;
         };
         resolveCodeFeatures: (features: import("../types").VueCodeInformation) => import("../types").VueCodeInformation;
+        inVFor: boolean;
         slots: {
             name: string;
             offset?: number;
@@ -170,10 +182,6 @@ export declare const tsCodegen: WeakMap<Sfc, {
         }[];
         dollarVars: Set<string>;
         accessExternalVariables: Map<string, Set<number>>;
-        lastGenericComment: {
-            content: string;
-            offset: number;
-        } | undefined;
         blockConditions: string[];
         scopedClasses: {
             source: string;
@@ -187,25 +195,25 @@ export declare const tsCodegen: WeakMap<Sfc, {
         templateRefs: Map<string, {
             typeExp: string;
             offset: number;
-        }>;
+        }[]>;
         currentComponent: {
             ctxVar: string;
             used: boolean;
         } | undefined;
         singleRootElTypes: string[];
         singleRootNodes: Set<import("@vue/compiler-dom").ElementNode | null>;
+        addTemplateRef(name: string, typeExp: string, offset: number): void;
         accessExternalVariable(name: string, offset?: number): void;
-        hasLocalVariable: (name: string) => boolean;
-        addLocalVariable: (name: string) => void;
-        removeLocalVariable: (name: string) => void;
-        getInternalVariable: () => string;
-        getHoistVariable: (originalVar: string) => string;
-        generateHoistVariables: () => Generator<string, void, unknown>;
-        generateConditionGuards: () => Generator<string, void, unknown>;
-        ignoreError: () => Generator<Code>;
-        expectError: (prevNode: import("@vue/compiler-dom").CommentNode) => Generator<Code>;
-        resetDirectiveComments: (endStr: string) => Generator<Code>;
-        generateAutoImportCompletion: () => Generator<Code>;
+        hasLocalVariable(name: string): boolean;
+        addLocalVariable(name: string): void;
+        removeLocalVariable(name: string): void;
+        getInternalVariable(): string;
+        getHoistVariable(originalVar: string): string;
+        generateHoistVariables(): Generator<string, void, unknown>;
+        generateConditionGuards(): Generator<string, void, unknown>;
+        generateAutoImportCompletion(): Generator<Code>;
+        enter(node: import("@vue/compiler-dom").RootNode | import("@vue/compiler-dom").TemplateChildNode | import("@vue/compiler-dom").SimpleExpressionNode): boolean;
+        exit(): Generator<Code>;
     } | undefined;
 }>;
 declare const plugin: VueLanguagePlugin;

package/lib/plugins/vue-tsx.js

@@ -12,6 +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 validLangs = new Set(['js', 'jsx', 'ts', 'tsx']);
 const plugin = ctx => {
     let appendedGlobalTypes = false;
     return {
@@ -22,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)) {
@@ -53,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);
@@ -68,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) {
@@ -83,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) {
@@ -98,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);

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 {

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/package.json

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