@vue/typescript-plugin 3.0.0-beta.1 → 3.0.0-beta.3

package/index.js

@@ -29,7 +29,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
                     info.project['program'].__vue__ = { language };
                 }
             }, 50);
-        }
+        },
     };
     function getVueCompilerOptions() {
         if (info.project.projectKind === ts.server.ProjectKind.Configured) {
@@ -58,47 +58,56 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
             return;
         }
         session.vueCommandsAdded = true;
-        session.addProtocolHandler('vue:collectExtractProps', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:projectInfo', ({ arguments: args }) => {
+            return session.handlers.get('projectInfo')?.({ arguments: args });
+        });
+        session.addProtocolHandler('_vue:documentHighlights-full', ({ arguments: args }) => {
+            return session.handlers.get('documentHighlights-full')?.({ arguments: args });
+        });
+        session.addProtocolHandler('_vue:quickinfo', ({ arguments: args }) => {
+            return session.handlers.get('quickinfo')?.({ arguments: args });
+        });
+        session.addProtocolHandler('_vue:collectExtractProps', ({ arguments: args }) => {
             return {
                 response: collectExtractProps_1.collectExtractProps.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getImportPathForFile', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getImportPathForFile', ({ arguments: args }) => {
             return {
                 response: getImportPathForFile_1.getImportPathForFile.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getPropertiesAtLocation', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getPropertiesAtLocation', ({ arguments: args }) => {
             return {
                 response: getPropertiesAtLocation_1.getPropertiesAtLocation.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getComponentNames', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentNames', ({ arguments: args }) => {
             return {
                 response: getComponentNames_1.getComponentNames.apply(getRequestContext(args[0]), args) ?? [],
             };
         });
-        session.addProtocolHandler('vue:getComponentProps', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getComponentProps', ({ arguments: args }) => {
             return {
                 response: getComponentProps_1.getComponentProps.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getComponentEvents', ({ arguments: 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:getComponentDirectives', ({ arguments: args }) => {
             return {
                 response: getComponentDirectives_1.getComponentDirectives.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getElementAttrs', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getElementAttrs', ({ arguments: args }) => {
             return {
                 response: getElementAttrs_1.getElementAttrs.apply(getRequestContext(args[0]), args),
             };
         });
-        session.addProtocolHandler('vue:getElementNames', ({ arguments: args }) => {
+        session.addProtocolHandler('_vue:getElementNames', ({ arguments: args }) => {
             return {
                 response: getElementNames_1.getElementNames.apply(getRequestContext(args[0]), args),
             };

package/lib/common.js

@@ -10,7 +10,7 @@ function createVueLanguageServiceProxy(ts, language, languageService, vueOptions
     const proxyCache = new Map();
     const getProxyMethod = (target, p) => {
         switch (p) {
-            case 'getCompletionsAtPosition': return getCompletionsAtPosition(vueOptions, target[p]);
+            case 'getCompletionsAtPosition': return getCompletionsAtPosition(ts, language, vueOptions, asScriptId, target[p]);
             case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, asScriptId, target[p]);
             case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(target[p]);
             case 'getDefinitionAndBoundSpan': return getDefinitionAndBoundSpan(ts, language, languageService, vueOptions, asScriptId, target[p]);
@@ -37,7 +37,7 @@ function createVueLanguageServiceProxy(ts, language, languageService, vueOptions
         },
     });
 }
-function getCompletionsAtPosition(vueOptions, getCompletionsAtPosition) {
+function getCompletionsAtPosition(ts, language, vueOptions, asScriptId, getCompletionsAtPosition) {
     return (filePath, position, options, formattingSettings) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const result = getCompletionsAtPosition(fileName, position, options, formattingSettings);
@@ -45,6 +45,30 @@ function getCompletionsAtPosition(vueOptions, getCompletionsAtPosition) {
             // filter __VLS_
             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 root = sourceScript?.generated?.root;
+            if (root instanceof language_core_1.VueVirtualCode) {
+                const blocks = [
+                    root.sfc.template,
+                    ...root.sfc.styles,
+                ];
+                const ranges = blocks.filter(Boolean).map(block => [
+                    block.startTagEnd,
+                    block.endTagStart,
+                ]);
+                if (ranges.some(([start, end]) => position >= start && position <= end)) {
+                    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'
+                        || !sortTexts.has(entry.sortText)
+                        || (0, shared_1.isGloballyAllowed)(entry.name)));
+                }
+            }
             // modify label
             for (const item of result.entries) {
                 if (item.source) {
@@ -88,7 +112,7 @@ function getCompletionEntryDetails(language, asScriptId, getCompletionEntryDetai
         // @ts-expect-error
         if (args[6]?.__isComponentAutoImport) {
             // @ts-expect-error
-            const { ext, suffix, originalName, newName } = args[6]?.__isComponentAutoImport;
+            const { originalName, newName } = args[6].__isComponentAutoImport;
             for (const codeAction of details?.codeActions ?? []) {
                 for (const change of codeAction.changes) {
                     for (const textChange of change.textChanges) {
@@ -100,7 +124,7 @@ function getCompletionEntryDetails(language, asScriptId, getCompletionEntryDetai
         // @ts-expect-error
         if (args[6]?.__isAutoImport) {
             // @ts-expect-error
-            const { fileName } = args[6]?.__isAutoImport;
+            const { fileName } = args[6].__isAutoImport;
             const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
                 const sfc = sourceScript.generated.root.vueSfc;
@@ -260,8 +284,7 @@ function getEncodedSemanticClassifications(ts, language, languageService, asScri
                     start: span.start - template.startTagEnd,
                     length: span.length,
                 })) {
-                    result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256 // class
-                    );
+                    result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256);
                 }
             }
         }

package/lib/requests/getComponentProps.js

@@ -91,7 +91,7 @@ function generateCommentMarkdown(parts, jsDocTags) {
     const deprecated = jsDocTags.some(tag => tag.name === 'deprecated');
     return {
         content,
-        deprecated
+        deprecated,
     };
 }
 function _symbolDisplayPartsToMarkdown(parts) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.0-beta.1",
+	"version": "3.0.0-beta.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.14",
-		"@vue/language-core": "3.0.0-beta.1",
+		"@vue/language-core": "3.0.0-beta.3",
 		"@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": "7a2ea48123679387d7095a81ac49cfc667aeeabb"
+	"gitHead": "17e3beabc13e9eb59a82fb1a9f0252fd6685e444"
 }