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

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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.0-beta.1",
+	"version": "3.0.0-beta.2",
 	"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.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": "7a2ea48123679387d7095a81ac49cfc667aeeabb"
+	"gitHead": "ea40288f6fceebb65346732b6de5859c300cf1ee"
 }