@vue/typescript-plugin 3.0.7-alpha.0 → 3.0.7-alpha.1

package/index.js

@@ -76,7 +76,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
             const [fileName, templateCodeRange] = request.arguments;
             const { language, program, sourceScript, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
             return {
-                response: (0, collectExtractProps_1.collectExtractProps)(ts, language, program, sourceScript, virtualCode, templateCodeRange),
+                response: (0, collectExtractProps_1.collectExtractProps)(ts, language, program, sourceScript, virtualCode, templateCodeRange, true),
             };
         });
         session.addProtocolHandler('_vue:getImportPathForFile', request => {
@@ -90,7 +90,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
             const [fileName, position] = request.arguments;
             const { language, program, sourceScript, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
             return {
-                response: (0, getPropertiesAtLocation_1.getPropertiesAtLocation)(ts, language, program, sourceScript, virtualCode, position),
+                response: (0, getPropertiesAtLocation_1.getPropertiesAtLocation)(ts, language, program, sourceScript, virtualCode, position, true),
             };
         });
         session.addProtocolHandler('_vue:getComponentDirectives', request => {

package/lib/requests/collectExtractProps.d.ts

@@ -5,5 +5,5 @@ interface ExtractPropsInfo {
     type: string;
     model: boolean;
 }
-export declare function collectExtractProps(ts: typeof import('typescript'), language: Language, program: ts.Program, sourceScript: SourceScript, virtualCode: VueVirtualCode, templateCodeRange: [number, number]): ExtractPropsInfo[];
+export declare function collectExtractProps(ts: typeof import('typescript'), language: Language, program: ts.Program, sourceScript: SourceScript, virtualCode: VueVirtualCode, templateCodeRange: [number, number], isTsPlugin: boolean): ExtractPropsInfo[];
 export {};

package/lib/requests/collectExtractProps.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectExtractProps = collectExtractProps;
 const language_core_1 = require("@vue/language-core");
-function collectExtractProps(ts, language, program, sourceScript, virtualCode, templateCodeRange) {
+function collectExtractProps(ts, language, program, sourceScript, virtualCode, templateCodeRange, isTsPlugin) {
     const result = new Map();
     const sourceFile = program.getSourceFile(virtualCode.fileName);
     const checker = program.getTypeChecker();
@@ -17,7 +17,7 @@ function collectExtractProps(ts, language, program, sourceScript, virtualCode, t
             const { name } = node;
             for (const map of maps) {
                 let mapped = false;
-                for (const source of map.toSourceLocation(name.getEnd() - sourceScript.snapshot.getLength())) {
+                for (const source of map.toSourceLocation(name.getEnd() - (isTsPlugin ? sourceScript.snapshot.getLength() : 0))) {
                     if (source[0] >= sfc.template.startTagEnd + templateCodeRange[0]
                         && source[0] <= sfc.template.startTagEnd + templateCodeRange[1]
                         && (0, language_core_1.isSemanticTokensEnabled)(source[1].data)) {

package/lib/requests/getPropertiesAtLocation.d.ts

@@ -1,3 +1,3 @@
 import { type Language, type SourceScript, type VueVirtualCode } from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function getPropertiesAtLocation(ts: typeof import('typescript'), language: Language, program: ts.Program, sourceScript: SourceScript, virtualCode: VueVirtualCode, position: number): string[];
+export declare function getPropertiesAtLocation(ts: typeof import('typescript'), language: Language, program: ts.Program, sourceScript: SourceScript, virtualCode: VueVirtualCode, position: number, isTsPlugin: boolean): string[];

package/lib/requests/getPropertiesAtLocation.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropertiesAtLocation = getPropertiesAtLocation;
 const language_core_1 = require("@vue/language-core");
-function getPropertiesAtLocation(ts, language, program, sourceScript, virtualCode, position) {
+function getPropertiesAtLocation(ts, language, program, sourceScript, virtualCode, position, isTsPlugin) {
     const virtualScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(virtualCode);
     if (!virtualScript) {
         return [];
@@ -24,7 +24,7 @@ function getPropertiesAtLocation(ts, language, program, sourceScript, virtualCod
     if (!mapped) {
         return [];
     }
-    position += sourceScript.snapshot.getLength();
+    position += isTsPlugin ? sourceScript.snapshot.getLength() : 0;
     const sourceFile = program.getSourceFile(virtualCode.fileName);
     if (!sourceFile) {
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.7-alpha.0",
+	"version": "3.0.7-alpha.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.23",
-		"@vue/language-core": "3.0.7-alpha.0",
+		"@vue/language-core": "3.0.7-alpha.1",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1"
 	},
@@ -22,5 +22,5 @@
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "a66f2330b5aa6f811f571159245c46af0c36c534"
+	"gitHead": "320fc626c871e9ff17c0e4e92ea7ddb0c7641f34"
 }