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

package/index.js

@@ -23,7 +23,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
         languagePlugins: [languagePlugin],
         setup: language => {
             project2Service.set(info.project, [language, info.languageServiceHost, info.languageService]);
-            info.languageService = (0, common_1.createVueLanguageServiceProxy)(ts, language, info.languageService, vueOptions);
+            info.languageService = (0, common_1.createVueLanguageServiceProxy)(ts, language, info.languageService, vueOptions, fileName => fileName);
             // #3963
             const timer = setInterval(() => {
                 if (info.project['program']) {
@@ -60,84 +60,121 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
         if (session.handlers.has('_vue:projectInfo')) {
             return;
         }
-        session.addProtocolHandler('_vue:projectInfo', ({ arguments: args }) => {
-            return session.handlers.get('projectInfo')?.({ arguments: args });
+        session.addProtocolHandler('_vue:projectInfo', request => {
+            return session.handlers.get('projectInfo')?.(request);
         });
-        session.addProtocolHandler('_vue:documentHighlights-full', ({ arguments: args }) => {
-            return session.handlers.get('documentHighlights-full')?.({ arguments: args });
+        session.addProtocolHandler('_vue:documentHighlights-full', request => {
+            return session.handlers.get('documentHighlights-full')?.(request);
         });
-        session.addProtocolHandler('_vue:encodedSemanticClassifications-full', ({ arguments: args }) => {
-            return session.handlers.get('encodedSemanticClassifications-full')?.({ arguments: args });
+        session.addProtocolHandler('_vue:encodedSemanticClassifications-full', request => {
+            return session.handlers.get('encodedSemanticClassifications-full')?.(request);
         });
-        session.addProtocolHandler('_vue:quickinfo', ({ arguments: args }) => {
-            return session.handlers.get('quickinfo')?.({ arguments: args });
+        session.addProtocolHandler('_vue:quickinfo', request => {
+            return session.handlers.get('quickinfo')?.(request);
         });
-        session.addProtocolHandler('_vue:collectExtractProps', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:collectExtractProps', request => {
+            const [fileName, templateCodeRange] = request.arguments;
+            const { language, program, sourceScript, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
             return {
-                response: collectExtractProps_1.collectExtractProps.apply(getRequestContext(args[0]), args),
+                response: (0, collectExtractProps_1.collectExtractProps)(ts, language, program, sourceScript, virtualCode, templateCodeRange),
             };
         });
-        session.addProtocolHandler('_vue:getImportPathForFile', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getImportPathForFile', request => {
+            const [fileName, incomingFileName, preferences] = request.arguments;
+            const { languageServiceHost, program } = getLanguageService(fileName);
             return {
-                response: getImportPathForFile_1.getImportPathForFile.apply(getRequestContext(args[0]), args),
+                response: (0, getImportPathForFile_1.getImportPathForFile)(ts, languageServiceHost, program, fileName, incomingFileName, preferences),
             };
         });
-        session.addProtocolHandler('_vue:getPropertiesAtLocation', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getPropertiesAtLocation', request => {
+            const [fileName, position] = request.arguments;
+            const { language, program, sourceScript, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
             return {
-                response: getPropertiesAtLocation_1.getPropertiesAtLocation.apply(getRequestContext(args[0]), args),
+                response: (0, getPropertiesAtLocation_1.getPropertiesAtLocation)(ts, language, program, sourceScript, virtualCode, position),
             };
         });
-        session.addProtocolHandler('_vue:getComponentDirectives', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentDirectives', request => {
+            const [fileName] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getComponentDirectives_1.getComponentDirectives.apply(getRequestContext(args[0]), args),
+                response: (0, getComponentDirectives_1.getComponentDirectives)(ts, program, fileName),
             };
         });
-        session.addProtocolHandler('_vue:getComponentEvents', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentEvents', request => {
+            const [fileName, tag] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getComponentEvents_1.getComponentEvents.apply(getRequestContext(args[0]), args),
+                response: (0, getComponentEvents_1.getComponentEvents)(ts, program, fileName, tag),
             };
         });
-        session.addProtocolHandler('_vue:getComponentNames', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentNames', request => {
+            const [fileName] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getComponentNames_1.getComponentNames.apply(getRequestContext(args[0]), args) ?? [],
+                response: (0, getComponentNames_1.getComponentNames)(ts, program, fileName),
             };
         });
-        session.addProtocolHandler('_vue:getComponentProps', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentProps', request => {
+            const [fileName, tag] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getComponentProps_1.getComponentProps.apply(getRequestContext(args[0]), args),
+                response: (0, getComponentProps_1.getComponentProps)(ts, program, fileName, tag),
             };
         });
-        session.addProtocolHandler('_vue:getComponentSlots', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentSlots', request => {
+            const [fileName] = request.arguments;
+            const { program, virtualCode } = getLanguageServiceAndVirtualCode(fileName);
             return {
-                response: getComponentSlots_1.getComponentSlots.apply(getRequestContext(args[0]), args),
+                response: (0, getComponentSlots_1.getComponentSlots)(ts, program, virtualCode),
             };
         });
-        session.addProtocolHandler('_vue:getElementAttrs', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getElementAttrs', request => {
+            const [fileName, tag] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getElementAttrs_1.getElementAttrs.apply(getRequestContext(args[0]), args),
+                response: (0, getElementAttrs_1.getElementAttrs)(ts, program, fileName, tag),
             };
         });
-        session.addProtocolHandler('_vue:getElementNames', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getElementNames', request => {
+            const [fileName] = request.arguments;
+            const { program } = getLanguageService(fileName);
             return {
-                response: getElementNames_1.getElementNames.apply(getRequestContext(args[0]), args),
+                response: (0, getElementNames_1.getElementNames)(ts, program, fileName),
             };
         });
         projectService.logger.info('Vue specific commands are successfully added.');
     }
-    function getRequestContext(fileName) {
-        const fileAndProject = info.session.getFileAndProject({
+    function getLanguageServiceAndVirtualCode(fileName) {
+        const service = getLanguageService(fileName);
+        const sourceScript = service?.language.scripts.get(fileName);
+        if (!sourceScript) {
+            throw new Error('No source script found for file: ' + fileName);
+        }
+        const virtualCode = sourceScript.generated?.root;
+        if (!(virtualCode instanceof vue.VueVirtualCode)) {
+            throw new Error('No virtual code found for file: ' + fileName);
+        }
+        return {
+            ...service,
+            sourceScript,
+            virtualCode,
+        };
+    }
+    function getLanguageService(fileName) {
+        const { project } = info.session.getFileAndProject({
             file: fileName,
             projectFileName: undefined,
         });
-        const service = project2Service.get(fileAndProject.project);
+        const service = project2Service.get(project);
         if (!service) {
-            throw 'No RequestContext';
+            throw new Error('No vue service for project: ' + project.getProjectName());
         }
+        const [language, languageServiceHost, languageService] = service;
         return {
             typescript: ts,
-            languageService: service[2],
-            languageServiceHost: service[1],
-            language: service[0],
+            program: languageService.getProgram(),
+            languageServiceHost,
+            language,
         };
     }
 });

package/lib/common.d.ts

@@ -1,3 +1,3 @@
 import { type Language, type VueCompilerOptions } from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function createVueLanguageServiceProxy(ts: typeof import('typescript'), language: Language<string>, languageService: ts.LanguageService, vueOptions: VueCompilerOptions): ts.LanguageService;
+export declare function createVueLanguageServiceProxy<T>(ts: typeof import('typescript'), language: Language<T>, languageService: ts.LanguageService, vueOptions: VueCompilerOptions, asScriptId: (fileName: string) => T): ts.LanguageService;

package/lib/common.js

@@ -4,18 +4,18 @@ exports.createVueLanguageServiceProxy = createVueLanguageServiceProxy;
 const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const windowsPathReg = /\\/g;
-function createVueLanguageServiceProxy(ts, language, languageService, vueOptions) {
+function createVueLanguageServiceProxy(ts, language, languageService, vueOptions, asScriptId) {
     const proxyCache = new Map();
     const getProxyMethod = (target, p) => {
         switch (p) {
             case 'getCompletionsAtPosition':
-                return getCompletionsAtPosition(ts, language, vueOptions, target[p]);
+                return getCompletionsAtPosition(ts, language, asScriptId, vueOptions, target[p]);
             case 'getCompletionEntryDetails':
                 return getCompletionEntryDetails(language, target[p]);
             case 'getCodeFixesAtPosition':
                 return getCodeFixesAtPosition(target[p]);
             case 'getDefinitionAndBoundSpan':
-                return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, target[p]);
+                return getDefinitionAndBoundSpan(ts, language, asScriptId, languageService, vueOptions, target[p]);
         }
     };
     return new Proxy(languageService, {
@@ -36,7 +36,7 @@ function createVueLanguageServiceProxy(ts, language, languageService, vueOptions
         },
     });
 }
-function getCompletionsAtPosition(ts, language, vueOptions, getCompletionsAtPosition) {
+function getCompletionsAtPosition(ts, language, asScriptId, vueOptions, getCompletionsAtPosition) {
     return (filePath, position, options, formattingSettings) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const result = getCompletionsAtPosition(fileName, position, options, formattingSettings);
@@ -45,7 +45,7 @@ function getCompletionsAtPosition(ts, language, vueOptions, getCompletionsAtPosi
             result.entries = result.entries.filter(entry => !entry.name.includes('__VLS_')
                 && !entry.labelDetails?.description?.includes('__VLS_'));
             // filter global variables in template and styles
-            const sourceScript = language.scripts.get(fileName);
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             const root = sourceScript?.generated?.root;
             if (root instanceof language_core_1.VueVirtualCode) {
                 const blocks = [
@@ -153,14 +153,14 @@ function getCodeFixesAtPosition(getCodeFixesAtPosition) {
         return result;
     };
 }
-function getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, getDefinitionAndBoundSpan) {
+function getDefinitionAndBoundSpan(ts, language, asScriptId, languageService, vueOptions, getDefinitionAndBoundSpan) {
     return (fileName, position) => {
         const result = getDefinitionAndBoundSpan(fileName, position);
         if (!result?.definitions?.length) {
             return result;
         }
         const program = languageService.getProgram();
-        const sourceScript = language.scripts.get(fileName);
+        const sourceScript = language.scripts.get(asScriptId(fileName));
         if (!sourceScript?.generated) {
             return result;
         }

package/lib/requests/collectExtractProps.d.ts

@@ -1,8 +1,9 @@
-import type { RequestContext } from './types';
+import { type Language, type SourceScript, type VueVirtualCode } from '@vue/language-core';
+import type * as ts from 'typescript';
 interface ExtractPropsInfo {
     name: string;
     type: string;
     model: boolean;
 }
-export declare function collectExtractProps(this: RequestContext, fileName: string, templateCodeRange: [number, number]): ExtractPropsInfo[];
+export declare function collectExtractProps(ts: typeof import('typescript'), language: Language, program: ts.Program, sourceScript: SourceScript, virtualCode: VueVirtualCode, templateCodeRange: [number, number]): ExtractPropsInfo[];
 export {};

package/lib/requests/collectExtractProps.js

@@ -2,20 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectExtractProps = collectExtractProps;
 const language_core_1 = require("@vue/language-core");
-function collectExtractProps(fileName, templateCodeRange) {
-    const { typescript: ts, languageService, language } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
+function collectExtractProps(ts, language, program, sourceScript, virtualCode, templateCodeRange) {
     const result = new Map();
-    const program = languageService.getProgram();
-    const sourceFile = program.getSourceFile(fileName);
+    const sourceFile = program.getSourceFile(virtualCode.fileName);
     const checker = program.getTypeChecker();
-    const script = sourceScript.generated.languagePlugin.typescript?.getServiceScript(root);
-    const maps = script ? [...language.maps.forEach(script.code)].map(([, map]) => map) : [];
-    const { sfc } = root;
+    const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(virtualCode);
+    const maps = serviceScript ? [...language.maps.forEach(serviceScript.code)].map(([, map]) => map) : [];
+    const { sfc } = virtualCode;
     sourceFile.forEachChild(function visit(node) {
         if (ts.isPropertyAccessExpression(node)
             && ts.isIdentifier(node.expression)

package/lib/requests/getComponentDirectives.d.ts

@@ -1,2 +1,2 @@
-import type { RequestContext } from './types';
-export declare function getComponentDirectives(this: RequestContext, fileName: string): string[];
+import type * as ts from 'typescript';
+export declare function getComponentDirectives(ts: typeof import('typescript'), program: ts.Program, fileName: string): string[];

package/lib/requests/getComponentDirectives.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentDirectives = getComponentDirectives;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
 const builtInDirectives = new Set([
     'vBind',
@@ -11,14 +10,8 @@ const builtInDirectives = new Set([
     'vShow',
     'vSlot',
 ]);
-function getComponentDirectives(fileName) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const directives = (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_directives');
+function getComponentDirectives(ts, program, fileName) {
+    const directives = (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_directives');
     if (!directives) {
         return [];
     }

package/lib/requests/getComponentEvents.d.ts

@@ -1,2 +1,2 @@
-import type { RequestContext } from './types';
-export declare function getComponentEvents(this: RequestContext, fileName: string, tag: string): string[];
+import type * as ts from 'typescript';
+export declare function getComponentEvents(ts: typeof import('typescript'), program: ts.Program, fileName: string, tag: string): string[];

package/lib/requests/getComponentEvents.js

@@ -1,22 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentEvents = getComponentEvents;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getComponentEvents(fileName, tag) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const program = languageService.getProgram();
+function getComponentEvents(ts, program, fileName, tag) {
     const checker = program.getTypeChecker();
-    const components = (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_components');
+    const components = (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_components');
     if (!components) {
         return [];
     }
-    const componentType = (0, utils_1.getComponentType)(ts, languageService, root, components, fileName, tag);
+    const componentType = (0, utils_1.getComponentType)(ts, program, fileName, components, tag);
     if (!componentType) {
         return [];
     }

package/lib/requests/getComponentNames.d.ts

@@ -1,2 +1,2 @@
-import type { RequestContext } from './types';
-export declare function getComponentNames(this: RequestContext, fileName: string): string[];
+import type * as ts from 'typescript';
+export declare function getComponentNames(ts: typeof import('typescript'), program: ts.Program, fileName: string): string[];

package/lib/requests/getComponentNames.js

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentNames = getComponentNames;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getComponentNames(fileName) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const names = (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_components')
+function getComponentNames(ts, program, fileName) {
+    const names = (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_components')
         ?.type
         ?.getProperties()
         .map(c => c.name)

package/lib/requests/getComponentProps.d.ts

@@ -1,4 +1,4 @@
-import type { RequestContext } from './types';
+import type * as ts from 'typescript';
 export interface ComponentPropInfo {
     name: string;
     required?: boolean;
@@ -7,4 +7,4 @@ export interface ComponentPropInfo {
     documentation?: string;
     values?: string[];
 }
-export declare function getComponentProps(this: RequestContext, fileName: string, tag: string): ComponentPropInfo[];
+export declare function getComponentProps(ts: typeof import('typescript'), program: ts.Program, fileName: string, tag: string): ComponentPropInfo[];

package/lib/requests/getComponentProps.js

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentProps = getComponentProps;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getComponentProps(fileName, tag) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const components = (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_components');
+function getComponentProps(ts, program, fileName, tag) {
+    const components = (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_components');
     if (!components) {
         return [];
     }
-    const componentType = (0, utils_1.getComponentType)(ts, languageService, root, components, fileName, tag);
+    const componentType = (0, utils_1.getComponentType)(ts, program, fileName, components, tag);
     if (!componentType) {
         return [];
     }
     const result = new Map();
-    const program = languageService.getProgram();
     const checker = program.getTypeChecker();
     for (const sig of componentType.getCallSignatures()) {
         const propParam = sig.parameters[0];

package/lib/requests/getComponentSlots.d.ts

@@ -1,2 +1,3 @@
-import type { RequestContext } from './types';
-export declare function getComponentSlots(this: RequestContext, fileName: string): string[];
+import { type VueVirtualCode } from '@vue/language-core';
+import type * as ts from 'typescript';
+export declare function getComponentSlots(ts: typeof import('typescript'), program: ts.Program, virtualCode: VueVirtualCode): string[];

package/lib/requests/getComponentSlots.js

@@ -3,19 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentSlots = getComponentSlots;
 const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getComponentSlots(fileName) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const codegen = language_core_1.tsCodegen.get(root.sfc);
+function getComponentSlots(ts, program, virtualCode) {
+    const codegen = language_core_1.tsCodegen.get(virtualCode.sfc);
     if (!codegen) {
         return [];
     }
     const assignName = codegen.getSetupSlotsAssignName() ?? `__VLS_slots`;
-    const slots = (0, utils_1.getVariableType)(ts, languageService, root, assignName);
+    const slots = (0, utils_1.getVariableType)(ts, program, virtualCode.fileName, assignName);
     if (!slots) {
         return [];
     }

package/lib/requests/getElementAttrs.d.ts

@@ -1,2 +1,2 @@
-import type { RequestContext } from './types';
-export declare function getElementAttrs(this: RequestContext, fileName: string, tagName: string): string[];
+import type * as ts from 'typescript';
+export declare function getElementAttrs(ts: typeof import('typescript'), program: ts.Program, fileName: string, tag: string): string[];

package/lib/requests/getElementAttrs.js

@@ -1,22 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementAttrs = getElementAttrs;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getElementAttrs(fileName, tagName) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const program = languageService.getProgram();
+function getElementAttrs(ts, program, fileName, tag) {
     const checker = program.getTypeChecker();
-    const elements = (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_elements');
+    const elements = (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_elements');
     if (!elements) {
         return [];
     }
-    const elementType = elements.type.getProperty(tagName);
+    const elementType = elements.type.getProperty(tag);
     if (!elementType) {
         return [];
     }

package/lib/requests/getElementNames.d.ts

@@ -1,2 +1,2 @@
-import type { RequestContext } from './types';
-export declare function getElementNames(this: RequestContext, fileName: string): string[];
+import type * as ts from 'typescript';
+export declare function getElementNames(ts: typeof import('typescript'), program: ts.Program, fileName: string): string[];

package/lib/requests/getElementNames.js

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementNames = getElementNames;
-const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
-function getElementNames(fileName) {
-    const { typescript: ts, language, languageService } = this;
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    return (0, utils_1.getVariableType)(ts, languageService, root, '__VLS_elements')
+function getElementNames(ts, program, fileName) {
+    return (0, utils_1.getVariableType)(ts, program, fileName, '__VLS_elements')
         ?.type
         ?.getProperties()
         .map(c => c.name)

package/lib/requests/getImportPathForFile.d.ts

@@ -1,5 +1,4 @@
 import type * as ts from 'typescript';
-import type { RequestContext } from './types';
-export declare function getImportPathForFile(this: RequestContext, fileName: string, incomingFileName: string, preferences: ts.UserPreferences): {
+export declare function getImportPathForFile(ts: typeof import('typescript'), languageServiceHost: ts.LanguageServiceHost, program: ts.Program, fileName: string, incomingFileName: string, preferences: ts.UserPreferences): {
     path?: string;
 };

package/lib/requests/getImportPathForFile.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImportPathForFile = getImportPathForFile;
-function getImportPathForFile(fileName, incomingFileName, preferences) {
-    const { typescript: ts, languageService, languageServiceHost } = this;
-    const program = languageService.getProgram();
-    const incomingFile = program?.getSourceFile(incomingFileName);
-    const sourceFile = program?.getSourceFile(fileName);
+function getImportPathForFile(ts, languageServiceHost, program, fileName, incomingFileName, preferences) {
+    const incomingFile = program.getSourceFile(incomingFileName);
+    const sourceFile = program.getSourceFile(fileName);
     if (!program || !sourceFile || !incomingFile) {
         return {};
     }

package/lib/requests/getPropertiesAtLocation.d.ts

@@ -1,2 +1,3 @@
-import type { RequestContext } from './types';
-export declare function getPropertiesAtLocation(this: RequestContext, fileName: string, position: number): string[];
+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[];

package/lib/requests/getPropertiesAtLocation.js

@@ -3,15 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropertiesAtLocation = getPropertiesAtLocation;
 const language_core_1 = require("@vue/language-core");
-function getPropertiesAtLocation(fileName, position) {
-    const { languageService, language, typescript: ts } = this;
-    // mapping
-    const sourceScript = language.scripts.get(fileName);
-    const root = sourceScript?.generated?.root;
-    if (!sourceScript?.generated || !(root instanceof language_core_1.VueVirtualCode)) {
-        return [];
-    }
-    const virtualScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(root);
+function getPropertiesAtLocation(ts, language, program, sourceScript, virtualCode, position) {
+    const virtualScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(virtualCode);
     if (!virtualScript) {
         return [];
     }
@@ -32,8 +25,7 @@ function getPropertiesAtLocation(fileName, position) {
         return [];
     }
     position += sourceScript.snapshot.getLength();
-    const program = languageService.getProgram();
-    const sourceFile = program.getSourceFile(fileName);
+    const sourceFile = program.getSourceFile(virtualCode.fileName);
     if (!sourceFile) {
         return [];
     }

package/lib/requests/index.d.ts

@@ -1,19 +1,18 @@
 import type * as ts from 'typescript';
-type Request<T extends (...args: any) => any> = (...args: Parameters<T>) => MaybePromise<ReturnType<T> | null | undefined>;
-type MaybePromise<T> = T | Promise<T>;
+type Response<T> = T | null | undefined | Promise<T | null | undefined>;
 export interface Requests {
-    collectExtractProps: Request<typeof import('./collectExtractProps.js')['collectExtractProps']>;
-    getImportPathForFile: Request<typeof import('./getImportPathForFile.js')['getImportPathForFile']>;
-    getPropertiesAtLocation: Request<typeof import('./getPropertiesAtLocation.js')['getPropertiesAtLocation']>;
-    getComponentDirectives: Request<typeof import('./getComponentDirectives.js')['getComponentDirectives']>;
-    getComponentEvents: Request<typeof import('./getComponentEvents.js')['getComponentEvents']>;
-    getComponentNames: Request<typeof import('./getComponentNames.js')['getComponentNames']>;
-    getComponentProps: Request<typeof import('./getComponentProps.js')['getComponentProps']>;
-    getComponentSlots: Request<typeof import('./getComponentSlots.js')['getComponentSlots']>;
-    getElementAttrs: Request<typeof import('./getElementAttrs.js')['getElementAttrs']>;
-    getElementNames: Request<typeof import('./getElementNames.js')['getElementNames']>;
-    getDocumentHighlights: Request<(fileName: string, position: number) => ts.DocumentHighlights[]>;
-    getEncodedSemanticClassifications: Request<(fileName: string, span: ts.TextSpan) => ts.Classifications>;
-    getQuickInfoAtPosition: Request<(fileName: string, position: ts.LineAndCharacter) => string>;
+    collectExtractProps(fileName: string, templateCodeRange: [number, number]): Response<ReturnType<typeof import('./collectExtractProps.js')['collectExtractProps']>>;
+    getImportPathForFile(fileName: string, incomingFileName: string, preferences: ts.UserPreferences): Response<ReturnType<typeof import('./getImportPathForFile.js')['getImportPathForFile']>>;
+    getPropertiesAtLocation(fileName: string, position: number): Response<ReturnType<typeof import('./getPropertiesAtLocation.js')['getPropertiesAtLocation']>>;
+    getComponentDirectives(fileName: string): Response<ReturnType<typeof import('./getComponentDirectives.js')['getComponentDirectives']>>;
+    getComponentEvents(fileName: string, tag: string): Response<ReturnType<typeof import('./getComponentEvents.js')['getComponentEvents']>>;
+    getComponentNames(fileName: string): Response<ReturnType<typeof import('./getComponentNames.js')['getComponentNames']>>;
+    getComponentProps(fileName: string, tag: string): Response<ReturnType<typeof import('./getComponentProps.js')['getComponentProps']>>;
+    getComponentSlots(fileName: string): Response<ReturnType<typeof import('./getComponentSlots.js')['getComponentSlots']>>;
+    getElementAttrs(fileName: string, tag: string): Response<ReturnType<typeof import('./getElementAttrs.js')['getElementAttrs']>>;
+    getElementNames(fileName: string): Response<ReturnType<typeof import('./getElementNames.js')['getElementNames']>>;
+    getDocumentHighlights(fileName: string, position: number): Response<ts.DocumentHighlights[]>;
+    getEncodedSemanticClassifications(fileName: string, span: ts.TextSpan): Response<ts.Classifications>;
+    getQuickInfoAtPosition(fileName: string, position: ts.LineAndCharacter): Response<string>;
 }
 export {};

package/lib/requests/utils.d.ts

@@ -1,8 +1,7 @@
-import type { VueVirtualCode } from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function getComponentType(ts: typeof import('typescript'), languageService: ts.LanguageService, vueCode: VueVirtualCode, components: NonNullable<ReturnType<typeof getVariableType>>, fileName: string, tag: string): ts.Type | undefined;
+export declare function getComponentType(ts: typeof import('typescript'), program: ts.Program, fileName: string, components: NonNullable<ReturnType<typeof getVariableType>>, tag: string): ts.Type | undefined;
 export declare function getSelfComponentName(fileName: string): Capitalize<string>;
-export declare function getVariableType(ts: typeof import('typescript'), languageService: ts.LanguageService, vueCode: VueVirtualCode, name: string): {
+export declare function getVariableType(ts: typeof import('typescript'), program: ts.Program, fileName: string, name: string): {
     node: ts.Node;
     type: ts.Type;
 } | undefined;

package/lib/requests/utils.js

@@ -5,8 +5,7 @@ exports.getSelfComponentName = getSelfComponentName;
 exports.getVariableType = getVariableType;
 const shared_1 = require("@vue/shared");
 const path = require("path-browserify");
-function getComponentType(ts, languageService, vueCode, components, fileName, tag) {
-    const program = languageService.getProgram();
+function getComponentType(ts, program, fileName, components, tag) {
     const checker = program.getTypeChecker();
     const name = tag.split('.');
     let componentSymbol = components.type.getProperty(name[0])
@@ -16,7 +15,7 @@ function getComponentType(ts, languageService, vueCode, components, fileName, ta
     if (!componentSymbol) {
         const name = getSelfComponentName(fileName);
         if (name === (0, shared_1.capitalize)((0, shared_1.camelize)(tag))) {
-            componentType = getVariableType(ts, languageService, vueCode, '__VLS_self')?.type;
+            componentType = getVariableType(ts, program, fileName, '__VLS_self')?.type;
         }
     }
     else {
@@ -34,9 +33,8 @@ function getSelfComponentName(fileName) {
     const baseName = path.basename(fileName);
     return (0, shared_1.capitalize)((0, shared_1.camelize)(baseName.slice(0, baseName.lastIndexOf('.'))));
 }
-function getVariableType(ts, languageService, vueCode, name) {
-    const program = languageService.getProgram();
-    const tsSourceFile = program.getSourceFile(vueCode.fileName);
+function getVariableType(ts, program, fileName, name) {
+    const tsSourceFile = program.getSourceFile(fileName);
     if (tsSourceFile) {
         const checker = program.getTypeChecker();
         const node = searchVariableDeclarationNode(ts, tsSourceFile, name);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.6",
+	"version": "3.0.7-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.23",
-		"@vue/language-core": "3.0.6",
+		"@vue/language-core": "3.0.7-alpha.0",
 		"@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": "59f8cde8a5148e54294868104312b2b0f4c30d1e"
+	"gitHead": "a66f2330b5aa6f811f571159245c46af0c36c534"
 }