@vue/typescript-plugin 3.0.3 → 3.0.4

package/index.js

@@ -7,6 +7,7 @@ const getComponentDirectives_1 = require("./lib/requests/getComponentDirectives"
 const getComponentEvents_1 = require("./lib/requests/getComponentEvents");
 const getComponentNames_1 = require("./lib/requests/getComponentNames");
 const getComponentProps_1 = require("./lib/requests/getComponentProps");
+const getComponentSlots_1 = require("./lib/requests/getComponentSlots");
 const getElementAttrs_1 = require("./lib/requests/getElementAttrs");
 const getElementNames_1 = require("./lib/requests/getElementNames");
 const getImportPathForFile_1 = require("./lib/requests/getImportPathForFile");
@@ -22,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, fileName => fileName);
+            info.languageService = (0, common_1.createVueLanguageServiceProxy)(ts, language, info.languageService, vueOptions);
             // #3963
             const timer = setInterval(() => {
                 if (info.project['program']) {
@@ -86,6 +87,16 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
                 response: getPropertiesAtLocation_1.getPropertiesAtLocation.apply(getRequestContext(args[0]), args),
             };
         });
+        session.addProtocolHandler('_vue:getComponentDirectives', ({ arguments: args }) => {
+            return {
+                response: getComponentDirectives_1.getComponentDirectives.apply(getRequestContext(args[0]), args),
+            };
+        });
+        session.addProtocolHandler('_vue:getComponentEvents', ({ arguments: args }) => {
+            return {
+                response: getComponentEvents_1.getComponentEvents.apply(getRequestContext(args[0]), args),
+            };
+        });
         session.addProtocolHandler('_vue:getComponentNames', ({ arguments: args }) => {
             return {
                 response: getComponentNames_1.getComponentNames.apply(getRequestContext(args[0]), args) ?? [],
@@ -96,14 +107,9 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
                 response: getComponentProps_1.getComponentProps.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('_vue:getComponentEvents', ({ arguments: args }) => {
-            return {
-                response: getComponentEvents_1.getComponentEvents.apply(getRequestContext(args[0]), args),
-            };
-        });
-        session.addProtocolHandler('_vue:getComponentDirectives', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentSlots', ({ arguments: args }) => {
             return {
-                response: getComponentDirectives_1.getComponentDirectives.apply(getRequestContext(args[0]), args),
+                response: getComponentSlots_1.getComponentSlots.apply(getRequestContext(args[0]), args),
             };
         });
         session.addProtocolHandler('_vue:getElementAttrs', ({ arguments: args }) => {
@@ -132,8 +138,6 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
             languageService: service[2],
             languageServiceHost: service[1],
             language: service[0],
-            isTsPlugin: true,
-            asScriptId: (fileName) => fileName,
         };
     }
 });

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<T>(ts: typeof import('typescript'), language: Language<T>, languageService: ts.LanguageService, vueOptions: VueCompilerOptions, asScriptId: (fileName: string) => T): ts.LanguageService;
+export declare function createVueLanguageServiceProxy(ts: typeof import('typescript'), language: Language<string>, languageService: ts.LanguageService, vueOptions: VueCompilerOptions): 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, asScriptId) {
+function createVueLanguageServiceProxy(ts, language, languageService, vueOptions) {
     const proxyCache = new Map();
     const getProxyMethod = (target, p) => {
         switch (p) {
             case 'getCompletionsAtPosition':
-                return getCompletionsAtPosition(ts, language, vueOptions, asScriptId, target[p]);
+                return getCompletionsAtPosition(ts, language, vueOptions, target[p]);
             case 'getCompletionEntryDetails':
-                return getCompletionEntryDetails(language, asScriptId, target[p]);
+                return getCompletionEntryDetails(language, target[p]);
             case 'getCodeFixesAtPosition':
                 return getCodeFixesAtPosition(target[p]);
             case 'getDefinitionAndBoundSpan':
-                return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, asScriptId, target[p]);
+                return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, target[p]);
         }
     };
     return new Proxy(languageService, {
@@ -36,7 +36,7 @@ function createVueLanguageServiceProxy(ts, language, languageService, vueOptions
         },
     });
 }
-function getCompletionsAtPosition(ts, language, vueOptions, asScriptId, getCompletionsAtPosition) {
+function getCompletionsAtPosition(ts, language, 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, asScriptId, getCompl
             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(asScriptId(fileName));
+            const sourceScript = language.scripts.get(fileName);
             const root = sourceScript?.generated?.root;
             if (root instanceof language_core_1.VueVirtualCode) {
                 const blocks = [
@@ -105,7 +105,7 @@ function getCompletionsAtPosition(ts, language, vueOptions, asScriptId, getCompl
         return result;
     };
 }
-function getCompletionEntryDetails(language, asScriptId, getCompletionEntryDetails) {
+function getCompletionEntryDetails(language, getCompletionEntryDetails) {
     return (...args) => {
         const details = getCompletionEntryDetails(...args);
         // modify import statement
@@ -125,7 +125,7 @@ function getCompletionEntryDetails(language, asScriptId, getCompletionEntryDetai
         if (args[6]?.__isAutoImport) {
             // @ts-expect-error
             const { fileName } = args[6].__isAutoImport;
-            const sourceScript = language.scripts.get(asScriptId(fileName));
+            const sourceScript = language.scripts.get(fileName);
             if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
                 const sfc = sourceScript.generated.root.vueSfc;
                 if (!sfc?.descriptor.script && !sfc?.descriptor.scriptSetup) {
@@ -153,14 +153,14 @@ function getCodeFixesAtPosition(getCodeFixesAtPosition) {
         return result;
     };
 }
-function getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, asScriptId, getDefinitionAndBoundSpan) {
+function getDefinitionAndBoundSpan(ts, language, 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(asScriptId(fileName));
+        const sourceScript = language.scripts.get(fileName);
         if (!sourceScript?.generated) {
             return result;
         }

package/lib/requests/collectExtractProps.js

@@ -3,8 +3,8 @@ 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, isTsPlugin, asScriptId } = this;
-    const sourceScript = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, languageService, language } = this;
+    const sourceScript = language.scripts.get(fileName);
     if (!sourceScript?.generated) {
         return;
     }
@@ -27,7 +27,7 @@ function collectExtractProps(fileName, templateCodeRange) {
             const { name } = node;
             for (const map of maps) {
                 let mapped = false;
-                for (const source of map.toSourceLocation(name.getEnd() - (isTsPlugin ? sourceScript.snapshot.getLength() : 0))) {
+                for (const source of map.toSourceLocation(name.getEnd() - sourceScript.snapshot.getLength())) {
                     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/getComponentDirectives.js

@@ -12,8 +12,8 @@ const builtInDirectives = new Set([
     'vSlot',
 ]);
 function getComponentDirectives(fileName) {
-    const { typescript: ts, language, languageService, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }

package/lib/requests/getComponentEvents.js

@@ -4,8 +4,8 @@ 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, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }

package/lib/requests/getComponentNames.js

@@ -5,8 +5,8 @@ exports._getComponentNames = _getComponentNames;
 const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
 function getComponentNames(fileName) {
-    const { typescript: ts, language, languageService, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }

package/lib/requests/getComponentProps.d.ts

@@ -4,7 +4,7 @@ export interface ComponentPropInfo {
     required?: boolean;
     deprecated?: boolean;
     isAttribute?: boolean;
-    commentMarkdown?: string;
+    documentation?: string;
     values?: string[];
 }
 export declare function getComponentProps(this: RequestContext, fileName: string, tag: string): ComponentPropInfo[] | undefined;

package/lib/requests/getComponentProps.js

@@ -4,8 +4,8 @@ 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, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }
@@ -49,7 +49,7 @@ function getComponentProps(fileName, tag) {
         }
         const name = prop.name;
         const required = !(prop.flags & ts.SymbolFlags.Optional) || undefined;
-        const { content: commentMarkdown, deprecated, } = generateCommentMarkdown(prop.getDocumentationComment(checker), prop.getJsDocTags());
+        const { documentation, deprecated, } = generateDocumentation(prop.getDocumentationComment(checker), prop.getJsDocTags());
         const values = [];
         const type = checker.getTypeOfSymbol(prop);
         const subTypes = type.types;
@@ -79,18 +79,18 @@ function getComponentProps(fileName, tag) {
             required,
             deprecated,
             isAttribute,
-            commentMarkdown,
+            documentation,
             values,
         });
     }
 }
-function generateCommentMarkdown(parts, jsDocTags) {
+function generateDocumentation(parts, jsDocTags) {
     const parsedComment = _symbolDisplayPartsToMarkdown(parts);
     const parsedJsDoc = _jsDocTagInfoToMarkdown(jsDocTags);
-    const content = [parsedComment, parsedJsDoc].filter(str => !!str).join('\n\n');
+    const documentation = [parsedComment, parsedJsDoc].filter(str => !!str).join('\n\n');
     const deprecated = jsDocTags.some(tag => tag.name === 'deprecated');
     return {
-        content,
+        documentation,
         deprecated,
     };
 }

package/lib/requests/getComponentSlots.d.ts

@@ -0,0 +1,2 @@
+import type { RequestContext } from './types';
+export declare function getComponentSlots(this: RequestContext, fileName: string): string[] | undefined;

package/lib/requests/getComponentSlots.js

@@ -0,0 +1,24 @@
+"use strict";
+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 volarFile = language.scripts.get(fileName);
+    if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
+        return;
+    }
+    const vueCode = volarFile.generated.root;
+    const codegen = language_core_1.tsCodegen.get(vueCode.sfc);
+    if (!codegen) {
+        return;
+    }
+    const assignName = codegen.getSetupSlotsAssignName() ?? `__VLS_slots`;
+    const slots = (0, utils_1.getVariableType)(ts, languageService, vueCode, assignName);
+    if (!slots) {
+        return [];
+    }
+    return slots.type.getProperties().map(({ name }) => name);
+}
+//# sourceMappingURL=getComponentSlots.js.map

package/lib/requests/getElementAttrs.js

@@ -4,8 +4,8 @@ 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, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }

package/lib/requests/getElementNames.js

@@ -5,8 +5,8 @@ exports._getElementNames = _getElementNames;
 const language_core_1 = require("@vue/language-core");
 const utils_1 = require("./utils");
 function getElementNames(fileName) {
-    const { typescript: ts, language, languageService, asScriptId } = this;
-    const volarFile = language.scripts.get(asScriptId(fileName));
+    const { typescript: ts, language, languageService } = this;
+    const volarFile = language.scripts.get(fileName);
     if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }

package/lib/requests/getMissingPropsDiagnostics.d.ts

@@ -0,0 +1,10 @@
+import type { RequestContext } from './types';
+export interface ComponentPropInfo {
+    name: string;
+    required?: boolean;
+    deprecated?: boolean;
+    isAttribute?: boolean;
+    commentMarkdown?: string;
+    values?: string[];
+}
+export declare function getMissingPropsDiagnostics(this: RequestContext, fileName: string): undefined;

package/lib/requests/getMissingPropsDiagnostics.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMissingPropsDiagnostics = getMissingPropsDiagnostics;
+const language_core_1 = require("@vue/language-core");
+function getMissingPropsDiagnostics(fileName) {
+    const { typescript: ts, language, languageService, asScriptId } = this;
+    const volarFile = language.scripts.get(asScriptId(fileName));
+    if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
+        return;
+    }
+    const vueCode = volarFile.generated.root;
+    const program = languageService.getProgram();
+    const sourceFile = program.getSourceFile(vueCode.fileName);
+    if (!sourceFile) {
+        return;
+    }
+    const checker = program.getTypeChecker();
+    ts.forEachChild(sourceFile, function visit(node) {
+        if (ts.isVariableDeclaration(node)
+            && node.initializer
+            && ts.isCallExpression(node.initializer)
+            && ts.isIdentifier(node.initializer.expression)
+            && /^__VLS_\d+$/.test(node.initializer.expression.text)) {
+            const firstArg = node.initializer.arguments[0];
+            const type = checker.getTypeAtLocation(firstArg);
+            const contextualType = checker.getContextualType(firstArg);
+            if (contextualType) {
+                const subtype = contextualType.isUnion()
+                    ? contextualType.types.find(subtype => checker.isTypeAssignableTo(subtype, type))
+                    : contextualType;
+                void subtype;
+            }
+        }
+        else {
+            ts.forEachChild(node, visit);
+        }
+    });
+    return undefined;
+}
+//# sourceMappingURL=getMissingPropsDiagnostics.js.map

package/lib/requests/getPropertiesAtLocation.js

@@ -4,9 +4,9 @@ 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, isTsPlugin, asScriptId } = this;
+    const { languageService, language, typescript: ts } = this;
     // mapping
-    const file = language.scripts.get(asScriptId(fileName));
+    const file = language.scripts.get(fileName);
     if (file?.generated) {
         const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
         if (!virtualScript) {
@@ -28,9 +28,7 @@ function getPropertiesAtLocation(fileName, position) {
         if (!mapped) {
             return;
         }
-        if (isTsPlugin) {
-            position += file.snapshot.getLength();
-        }
+        position += file.snapshot.getLength();
     }
     const program = languageService.getProgram();
     const sourceFile = program.getSourceFile(fileName);

package/lib/requests/index.d.ts

@@ -4,12 +4,14 @@ export type Requests = {
     collectExtractProps: ToRequest<typeof import('./collectExtractProps.js')['collectExtractProps']>;
     getImportPathForFile: ToRequest<typeof import('./getImportPathForFile.js')['getImportPathForFile']>;
     getPropertiesAtLocation: ToRequest<typeof import('./getPropertiesAtLocation.js')['getPropertiesAtLocation']>;
+    getComponentDirectives: ToRequest<typeof import('./getComponentDirectives.js')['getComponentDirectives']>;
+    getComponentEvents: ToRequest<typeof import('./getComponentEvents.js')['getComponentEvents']>;
     getComponentNames: ToRequest<typeof import('./getComponentNames.js')['getComponentNames']>;
     getComponentProps: ToRequest<typeof import('./getComponentProps.js')['getComponentProps']>;
-    getComponentEvents: ToRequest<typeof import('./getComponentEvents.js')['getComponentEvents']>;
-    getComponentDirectives: ToRequest<typeof import('./getComponentDirectives.js')['getComponentDirectives']>;
+    getComponentSlots: ToRequest<typeof import('./getComponentSlots.js')['getComponentSlots']>;
     getElementAttrs: ToRequest<typeof import('./getElementAttrs.js')['getElementAttrs']>;
     getElementNames: ToRequest<typeof import('./getElementNames.js')['getElementNames']>;
+    getDocumentHighlights: ToRequest<(fileName: string, position: number) => ts.DocumentHighlights[]>;
     getEncodedSemanticClassifications: ToRequest<(fileName: string, span: ts.TextSpan) => ts.Classifications>;
     getQuickInfoAtPosition: ToRequest<(fileName: string, position: ts.LineAndCharacter) => string>;
 };

package/lib/requests/types.d.ts

@@ -1,10 +1,8 @@
 import type { Language } from '@vue/language-core';
 import type * as ts from 'typescript';
-export interface RequestContext<T = any> {
+export interface RequestContext {
     typescript: typeof ts;
     languageService: ts.LanguageService;
     languageServiceHost: ts.LanguageServiceHost;
-    language: Language<T>;
-    isTsPlugin: boolean;
-    asScriptId: (fileName: string) => T;
+    language: Language<string>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.20",
-		"@vue/language-core": "3.0.3",
+		"@vue/language-core": "3.0.4",
 		"@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": "129f30ff8d8d976abf0431063be5c6c4cf88f0fd"
+	"gitHead": "148d386f9779c2de64cdcbd35310e03b36943b05"
 }