@vue/language-core 2.1.8 → 2.1.10

package/lib/codegen/globalTypes.js

@@ -88,9 +88,7 @@ function generateGlobalTypes(lib, target, strictTemplates) {
 	function __VLS_getVForSourceType(source: number): [number, number, number][];
 	function __VLS_getVForSourceType(source: string): [string, number, number][];
 	function __VLS_getVForSourceType<T extends any[]>(source: T): [
-		item: ${(target >= 3 ? `import('${lib}').Reactive<T[number]>` :
-        target >= 2.7 ? `import('${lib}').UnwrapNestedRefs<T[number]>` :
-            `T[number]`)},
+		item: T[number],
 		key: number,
 		index: number,
 	][];

package/lib/codegen/script/componentSelf.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateComponentSelf = generateComponentSelf;
+const path = require("path-browserify");
 const common_1 = require("../common");
 const component_1 = require("./component");
 const index_1 = require("./index");
@@ -54,7 +55,7 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
         yield `})${common_1.endOfLine}`; // defineComponent {
     }
     else if (options.sfc.script) {
-        yield `let __VLS_self!: typeof import('./${options.fileBaseName}').default${common_1.endOfLine}`;
+        yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${common_1.endOfLine}`;
     }
     else {
         yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${common_1.endOfLine}`;

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

@@ -13,7 +13,7 @@ export declare const codeFeatures: {
     navigationWithoutRename: VueCodeInformation;
 };
 export interface ScriptCodegenOptions {
-    fileBaseName: string;
+    fileName: string;
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;

package/lib/codegen/script/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.codeFeatures = void 0;
 exports.generateScript = generateScript;
 exports.generateScriptSectionPartiallyEnding = generateScriptSectionPartiallyEnding;
+const path = require("path-browserify");
 const common_1 = require("../common");
 const globalTypes_1 = require("../globalTypes");
 const componentSelf_1 = require("./componentSelf");
@@ -38,7 +39,11 @@ function* generateScript(options) {
     if (options.vueCompilerOptions.__setupedGlobalTypes) {
         const globalTypes = options.vueCompilerOptions.__setupedGlobalTypes;
         if (typeof globalTypes === 'object') {
-            yield `/// <reference types="${globalTypes.absolutePath}" />${common_1.newLine}`;
+            let relativePath = path.relative(path.dirname(options.fileName), globalTypes.absolutePath);
+            if (relativePath !== globalTypes.absolutePath && !relativePath.startsWith('./') && !relativePath.startsWith('../')) {
+                relativePath = './' + relativePath;
+            }
+            yield `/// <reference types="${relativePath}" />${common_1.newLine}`;
         }
         else {
             yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${common_1.newLine}`;

package/lib/codegen/script/scriptSetup.js

@@ -156,27 +156,31 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         }
     }
     if (scriptSetupRanges.cssModules.length) {
-        for (const { define: { arg, exp } } of scriptSetupRanges.cssModules) {
+        for (const { define } of scriptSetupRanges.cssModules) {
             setupCodeModifies.push([
-                arg ? [
+                [`(`],
+                define.start,
+                define.start
+            ], [
+                define.arg ? [
                     ` as Omit<__VLS_StyleModules, '$style'>[`,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.all),
-                    `]`
+                    (0, common_1.generateSfcBlockSection)(scriptSetup, define.arg.start, define.arg.end, index_1.codeFeatures.all),
+                    `])`
                 ] : [
                     ` as __VLS_StyleModules[`,
-                    ['', scriptSetup.name, exp.start, index_1.codeFeatures.verification],
+                    ['', scriptSetup.name, define.exp.start, index_1.codeFeatures.verification],
                     `'$style'`,
-                    ['', scriptSetup.name, exp.end, index_1.codeFeatures.verification],
-                    `]`
+                    ['', scriptSetup.name, define.exp.end, index_1.codeFeatures.verification],
+                    `])`
                 ],
-                exp.end,
-                exp.end
+                define.end,
+                define.end
             ]);
         }
     }
     const isTs = options.lang !== 'js' && options.lang !== 'jsx';
     for (const { define } of scriptSetupRanges.templateRefs) {
-        if (!define?.arg) {
+        if (!define.arg) {
             continue;
         }
         if (isTs) {

package/lib/codegen/script/styleModulesType.js

@@ -6,7 +6,7 @@ const template_1 = require("./template");
 const common_1 = require("../common");
 function* generateStyleModulesType(options, ctx) {
     const styles = options.sfc.styles.map((style, i) => [style, i]).filter(([style]) => style.module);
-    if (!styles.length) {
+    if (!styles.length && !options.scriptSetupRanges?.cssModules.length) {
         return;
     }
     yield `type __VLS_StyleModules = {${common_1.newLine}`;

package/lib/codegen/script/template.js

@@ -4,6 +4,7 @@ exports.generateTemplateDirectives = generateTemplateDirectives;
 exports.generateTemplate = generateTemplate;
 exports.generateCssClassProperty = generateCssClassProperty;
 exports.getTemplateUsageVars = getTemplateUsageVars;
+const path = require("path-browserify");
 const shared_1 = require("../../utils/shared");
 const common_1 = require("../common");
 const context_1 = require("../template/context");
@@ -13,7 +14,7 @@ const index_1 = require("./index");
 function* generateTemplateCtx(options) {
     const exps = [];
     exps.push(`{} as InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>`);
-    if (options.vueCompilerOptions.petiteVueExtensions.some(ext => options.fileBaseName.endsWith(ext))) {
+    if (options.vueCompilerOptions.petiteVueExtensions.some(ext => options.fileName.endsWith(ext))) {
         exps.push(`globalThis`);
     }
     if (options.sfc.styles.some(style => style.module)) {
@@ -51,7 +52,8 @@ function* generateTemplateComponents(options) {
         nameType = options.sfc.script.content.substring(nameOption.start, nameOption.end);
     }
     else if (options.sfc.scriptSetup) {
-        nameType = `'${options.scriptSetupRanges?.options.name ?? options.fileBaseName.substring(0, options.fileBaseName.lastIndexOf('.'))}'`;
+        const baseName = path.basename(options.fileName);
+        nameType = `'${options.scriptSetupRanges?.options.name ?? baseName.substring(0, baseName.lastIndexOf('.'))}'`;
     }
     if (nameType) {
         exps.push(`{} as {

package/lib/parsers/scriptSetupRanges.d.ts

@@ -29,7 +29,9 @@ export declare function parseScriptSetupRanges(ts: typeof import('typescript'),
             exp: TextRange;
             arg?: TextRange;
             typeArg?: TextRange;
-        }>;
+        }> & {
+            statement: TextRange;
+        };
     };
     emits: {
         name?: string;

package/lib/parsers/scriptSetupRanges.js

@@ -207,7 +207,10 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                 });
             }
             else if (vueCompilerOptions.macros.defineSlots.includes(callText)) {
-                slots.define = parseDefineFunction(node);
+                slots.define = {
+                    ...parseDefineFunction(node),
+                    statement: getStatementRange(ts, parents, node, ast)
+                };
                 if (ts.isVariableDeclaration(parent)) {
                     if (ts.isIdentifier(parent.name)) {
                         slots.name = getNodeText(ts, parent.name, ast);

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

@@ -42,7 +42,9 @@ export declare const tsCodegen: WeakMap<Sfc, {
                 exp: import("../types").TextRange;
                 arg?: import("../types").TextRange;
                 typeArg?: import("../types").TextRange;
-            }>;
+            }> & {
+                statement: import("../types").TextRange;
+            };
         };
         emits: {
             name?: string;

package/lib/plugins/vue-tsx.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsCodegen = void 0;
 const alien_signals_1 = require("alien-signals");
-const path_browserify_1 = require("path-browserify");
 const script_1 = require("../codegen/script");
 const template_1 = require("../codegen/template");
 const scriptRanges_1 = require("../parsers/scriptRanges");
@@ -148,7 +147,7 @@ function createTsx(fileName, _sfc, ctx, appendGlobalTypes) {
         let generatedLength = 0;
         const codegen = (0, script_1.generateScript)({
             ts,
-            fileBaseName: path_browserify_1.posix.basename(fileName),
+            fileName,
             sfc: _sfc,
             lang: lang.get(),
             scriptRanges: scriptRanges.get(),

package/lib/virtualFile/computedSfc.js

@@ -6,7 +6,7 @@ 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 = 0;
+        const prevTrackId = alien_signals_1.System.activeTrackId;
         alien_signals_1.System.activeTrackId = 0;
         const res = snapshot.get();
         alien_signals_1.System.activeTrackId = prevTrackId;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.1.8",
+	"version": "2.1.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -37,5 +37,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "25cccedc53e7361ed4e34296d6ecd43d7de2a095"
+	"gitHead": "b0af30caee2f8dfb1a8393c1b400f38e31fa4883"
 }

package/lib/codegen/types.d.ts

@@ -1,9 +0,0 @@
-export interface InlayHintInfo {
-    blockName: string;
-    offset: number;
-    setting: string;
-    label: string;
-    tooltip?: string;
-    paddingRight?: boolean;
-    paddingLeft?: boolean;
-}

package/lib/codegen/types.js

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