@vue/typescript-plugin 3.0.0-alpha.8 → 3.0.0-beta.2

package/index.js

@@ -21,7 +21,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.proxyLanguageServiceForVue)(ts, language, info.languageService, vueOptions, fileName => fileName);
+            info.languageService = (0, common_1.createVueLanguageServiceProxy)(ts, language, info.languageService, vueOptions, fileName => fileName);
             // #3963
             const timer = setInterval(() => {
                 if (info.project['program']) {
@@ -120,7 +120,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
             languageServiceHost: service[1],
             language: service[0],
             isTsPlugin: true,
-            getFileId: (fileName) => fileName,
+            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 proxyLanguageServiceForVue<T>(ts: typeof import('typescript'), language: Language<T>, languageService: ts.LanguageService, vueOptions: VueCompilerOptions, asScriptId: (fileName: string) => T): 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

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyLanguageServiceForVue = proxyLanguageServiceForVue;
+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 proxyLanguageServiceForVue(ts, language, languageService, vueOptions, asScriptId) {
+function createVueLanguageServiceProxy(ts, language, languageService, vueOptions, asScriptId) {
     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 proxyLanguageServiceForVue(ts, language, languageService, vueOptions, a
         },
     });
 }
-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/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, getFileId } = this;
-    const sourceScript = language.scripts.get(getFileId(fileName));
+    const { typescript: ts, languageService, language, isTsPlugin, asScriptId } = this;
+    const sourceScript = language.scripts.get(asScriptId(fileName));
     if (!sourceScript?.generated) {
         return;
     }

package/lib/requests/getComponentDirectives.js

@@ -3,9 +3,17 @@ 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',
+    'vIf',
+    'vOn',
+    'vOnce',
+    'vShow',
+    'vSlot',
+]);
 function getComponentDirectives(fileName) {
-    const { typescript: ts, language, languageService, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }
@@ -17,6 +25,6 @@ function getComponentDirectives(fileName) {
     return directives.type.getProperties()
         .map(({ name }) => name)
         .filter(name => name.startsWith('v') && name.length >= 2 && name[1] === name[1].toUpperCase())
-        .filter(name => !['vBind', 'vIf', 'vOn', 'VOnce', 'vShow', 'VSlot'].includes(name));
+        .filter(name => !builtInDirectives.has(name));
 }
 //# sourceMappingURL=getComponentDirectives.js.map

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, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }

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, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }

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, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }

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, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }

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, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(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;
     }

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, getFileId } = this;
+    const { languageService, language, typescript: ts, isTsPlugin, asScriptId } = this;
     // mapping
-    const file = language.scripts.get(getFileId(fileName));
+    const file = language.scripts.get(asScriptId(fileName));
     if (file?.generated) {
         const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
         if (!virtualScript) {

package/lib/requests/types.d.ts

@@ -6,5 +6,5 @@ export interface RequestContext<T = any> {
     languageServiceHost: ts.LanguageServiceHost;
     language: Language<T>;
     isTsPlugin: boolean;
-    getFileId: (fileName: string) => T;
+    asScriptId: (fileName: string) => T;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.0.0-alpha.8",
+	"version": "3.0.0-beta.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,8 +13,8 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.13",
-		"@vue/language-core": "3.0.0-alpha.8",
+		"@volar/typescript": "2.4.14",
+		"@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": "d38cb93558fe8015c7ffe9ceacfdd3296e3692f6"
+	"gitHead": "ea40288f6fceebb65346732b6de5859c300cf1ee"
 }

package/lib/requests/getCurrentComponentSlots.d.ts

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

package/lib/requests/getCurrentComponentSlots.js

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

package/lib/requests/getDefineSlotNames.d.ts

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

package/lib/requests/getDefineSlotNames.js

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

package/lib/requests/getDefineSlots.d.ts

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

package/lib/requests/getDefineSlots.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefineSlots = getDefineSlots;
-const language_core_1 = require("@vue/language-core");
-const utils_1 = require("./utils");
-function getDefineSlots(fileName) {
-    const { typescript: ts, language, languageService, getFileId } = this;
-    const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const vueCode = volarFile.generated.root;
-    const slots = (0, utils_1.getTypeAliasType)(ts, languageService, vueCode, '__VLS_Slots');
-    return slots?.type.getProperties().map(prop => prop.getName());
-}
-//# sourceMappingURL=getDefineSlots.js.map