@vue/typescript-plugin 3.0.0 → 3.0.2

package/index.js

@@ -15,6 +15,9 @@ const windowsPathReg = /\\/g;
 const project2Service = new WeakMap();
 module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((ts, info) => {
     const vueOptions = getVueCompilerOptions();
+    if (vueOptions.globalTypesPath) {
+        ts.sys.writeFile(vueOptions.globalTypesPath, vue.generateGlobalTypes(vueOptions));
+    }
     const languagePlugin = vue.createVueLanguagePlugin(ts, info.languageServiceHost.getCompilationSettings(), vueOptions, id => id);
     addVueCommands();
     return {
@@ -64,6 +67,9 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
         session.addProtocolHandler('_vue:documentHighlights-full', ({ arguments: args }) => {
             return session.handlers.get('documentHighlights-full')?.({ arguments: args });
         });
+        session.addProtocolHandler('_vue:encodedSemanticClassifications-full', ({ arguments: args }) => {
+            return session.handlers.get('encodedSemanticClassifications-full')?.({ arguments: args });
+        });
         session.addProtocolHandler('_vue:quickinfo', ({ arguments: args }) => {
             return session.handlers.get('quickinfo')?.({ arguments: args });
         });

package/lib/common.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createVueLanguageServiceProxy = createVueLanguageServiceProxy;
 const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
-const getComponentNames_1 = require("./requests/getComponentNames");
-const getElementNames_1 = require("./requests/getElementNames");
 const windowsPathReg = /\\/g;
 function createVueLanguageServiceProxy(ts, language, languageService, vueOptions, asScriptId) {
     const proxyCache = new Map();
@@ -18,9 +16,6 @@ function createVueLanguageServiceProxy(ts, language, languageService, vueOptions
                 return getCodeFixesAtPosition(target[p]);
             case 'getDefinitionAndBoundSpan':
                 return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, asScriptId, target[p]);
-            // TS plugin only
-            case 'getEncodedSemanticClassifications':
-                return getEncodedSemanticClassifications(ts, language, target, asScriptId, target[p]);
         }
     };
     return new Proxy(languageService, {
@@ -62,13 +57,14 @@ function getCompletionsAtPosition(ts, language, vueOptions, asScriptId, getCompl
                     block.endTagStart,
                 ]);
                 if (ranges.some(([start, end]) => position >= start && position <= end)) {
+                    const globalKinds = new Set(['var', 'function', 'module']);
                     const globalsOrKeywords = ts.Completions.SortText.GlobalsOrKeywords;
                     const sortTexts = new Set([
                         globalsOrKeywords,
                         'z' + globalsOrKeywords,
                         globalsOrKeywords + '1',
                     ]);
-                    result.entries = result.entries.filter(entry => !(entry.kind === 'const' && entry.name in vueOptions.macros) && (entry.kind !== 'var' && entry.kind !== 'function'
+                    result.entries = result.entries.filter(entry => !(entry.kind === 'const' && entry.name in vueOptions.macros) && (!globalKinds.has(entry.kind)
                         || !sortTexts.has(entry.sortText)
                         || (0, shared_1.isGloballyAllowed)(entry.name)));
                 }
@@ -237,59 +233,4 @@ function getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, as
         }
     };
 }
-function getEncodedSemanticClassifications(ts, language, languageService, asScriptId, getEncodedSemanticClassifications) {
-    return (filePath, span, format) => {
-        const fileName = filePath.replace(windowsPathReg, '/');
-        const result = getEncodedSemanticClassifications(fileName, span, format);
-        const sourceScript = language.scripts.get(asScriptId(fileName));
-        const root = sourceScript?.generated?.root;
-        if (root instanceof language_core_1.VueVirtualCode) {
-            const { template } = root.sfc;
-            if (template) {
-                for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService }, root, template, {
-                    start: span.start - template.startTagEnd,
-                    length: span.length,
-                })) {
-                    result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256);
-                }
-            }
-        }
-        return result;
-    };
-}
-function getComponentSpans(vueCode, template, spanTemplateRange) {
-    const { typescript: ts, languageService } = this;
-    const result = [];
-    const validComponentNames = (0, getComponentNames_1._getComponentNames)(ts, languageService, vueCode);
-    const elements = new Set((0, getElementNames_1._getElementNames)(ts, languageService, vueCode));
-    const components = new Set([
-        ...validComponentNames,
-        ...validComponentNames.map(language_core_1.hyphenateTag),
-    ]);
-    if (template.ast) {
-        for (const node of (0, language_core_1.forEachElementNode)(template.ast)) {
-            if (node.loc.end.offset <= spanTemplateRange.start
-                || node.loc.start.offset >= (spanTemplateRange.start + spanTemplateRange.length)) {
-                continue;
-            }
-            if (components.has(node.tag) && !elements.has(node.tag)) {
-                let start = node.loc.start.offset;
-                if (template.lang === 'html') {
-                    start += '<'.length;
-                }
-                result.push({
-                    start,
-                    length: node.tag.length,
-                });
-                if (template.lang === 'html' && !node.isSelfClosing) {
-                    result.push({
-                        start: node.loc.start.offset + node.loc.source.lastIndexOf(node.tag),
-                        length: node.tag.length,
-                    });
-                }
-            }
-        }
-    }
-    return result;
-}
 //# sourceMappingURL=common.js.map

package/lib/requests/getComponentHighlights.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/requests/getComponentHighlights.js

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

package/lib/requests/getSemanticClassfications.d.ts

@@ -0,0 +1,3 @@
+import type * as ts from 'typescript';
+import type { RequestContext } from './types';
+export declare function getSemanticClassifications(this: RequestContext, fileName: string, span: ts.TextSpan): ts.ClassifiedSpan[] | ts.ClassifiedSpan2020[];

package/lib/requests/getSemanticClassfications.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSemanticClassifications = getSemanticClassifications;
+function getSemanticClassifications(fileName, span) {
+    const { languageService, typescript: ts } = this;
+    return languageService.getSemanticClassifications(fileName, span, ts.SemanticClassificationFormat.TwentyTwenty);
+}
+//# sourceMappingURL=getSemanticClassfications.js.map

package/lib/requests/getVariableProperties.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 getVariableProperties(this: RequestContext, fileName: string, variableName: string): string[] | undefined;

package/lib/requests/getVariableProperties.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVariableProperties = getVariableProperties;
+const language_core_1 = require("@vue/language-core");
+const utils_1 = require("./utils");
+function getVariableProperties(fileName, variableName) {
+    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 variable = (0, utils_1.getVariableType)(ts, languageService, vueCode, variableName);
+    return variable?.type.getProperties().map(prop => prop.name);
+}
+//# sourceMappingURL=getVariableProperties.js.map

package/lib/requests/index.d.ts

@@ -1,3 +1,4 @@
+import type * as ts from 'typescript';
 type ToRequest<T extends (...args: any) => any> = (...args: Parameters<T>) => Promise<ReturnType<T> | null | undefined>;
 export type Requests = {
     collectExtractProps: ToRequest<typeof import('./collectExtractProps.js')['collectExtractProps']>;
@@ -9,9 +10,7 @@ export type Requests = {
     getComponentDirectives: ToRequest<typeof import('./getComponentDirectives.js')['getComponentDirectives']>;
     getElementAttrs: ToRequest<typeof import('./getElementAttrs.js')['getElementAttrs']>;
     getElementNames: ToRequest<typeof import('./getElementNames.js')['getElementNames']>;
-    getQuickInfoAtPosition: ToRequest<(fileName: string, position: {
-        line: number;
-        character: number;
-    }) => string>;
+    getEncodedSemanticClassifications: ToRequest<(fileName: string, span: ts.TextSpan) => ts.Classifications>;
+    getQuickInfoAtPosition: ToRequest<(fileName: string, position: ts.LineAndCharacter) => string>;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.0",
+	"version": "3.0.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,8 +13,8 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.4.16",
-		"@vue/language-core": "3.0.0",
+		"@volar/typescript": "2.4.19",
+		"@vue/language-core": "3.0.2",
 		"@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": "620f050fd494cccd215781907c950e17dae4fd58"
+	"gitHead": "7343119e9ca4f6a54f63b57f448f15df4b592a9a"
 }