@vue/typescript-plugin 2.0.19 → 2.0.21

package/index.d.ts

@@ -1,3 +1,2 @@
-import type * as ts from 'typescript';
-declare const _default: ts.server.PluginModuleFactory;
-export = _default;
+declare const plugin: import("typescript").server.PluginModuleFactory;
+export = plugin;

package/index.js

@@ -1,100 +1,44 @@
 "use strict";
-const decorateLanguageService_1 = require("@volar/typescript/lib/node/decorateLanguageService");
-const decorateLanguageServiceHost_1 = require("@volar/typescript/lib/node/decorateLanguageServiceHost");
+const createLanguageServicePlugin_1 = require("@volar/typescript/lib/quickstart/createLanguageServicePlugin");
 const vue = require("@vue/language-core");
-const language_core_1 = require("@vue/language-core");
 const common_1 = require("./lib/common");
 const server_1 = require("./lib/server");
 const windowsPathReg = /\\/g;
-const externalFiles = new WeakMap();
-const projectExternalFileExtensions = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createLanguageServicePlugin() {
-    return modules => {
-        const { typescript: ts } = modules;
-        const pluginModule = {
-            create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const vueOptions = getVueCompilerOptions();
-                    const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false, () => info.languageServiceHost.getProjectVersion?.() ?? '', () => externalFiles.get(info.project) ?? [], info.languageServiceHost.getCompilationSettings(), vueOptions);
-                    const extensions = languagePlugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [];
-                    const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
-                    const syncedScriptVersions = new vue.FileMap(ts.sys.useCaseSensitiveFileNames);
-                    const language = (0, language_core_1.createLanguage)([languagePlugin], ts.sys.useCaseSensitiveFileNames, fileName => {
-                        const version = getScriptVersion(fileName);
-                        if (syncedScriptVersions.get(fileName) === version) {
-                            return;
-                        }
-                        syncedScriptVersions.set(fileName, version);
-                        const snapshot = getScriptSnapshot(fileName);
-                        if (snapshot) {
-                            language.scripts.set(fileName, snapshot);
-                        }
-                        else {
-                            language.scripts.delete(fileName);
-                        }
-                    });
-                    projectExternalFileExtensions.set(info.project, extensions);
-                    server_1.projects.set(info.project, { info, language, vueOptions });
-                    (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                    (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true, fileName => fileName);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
-                    (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
-                    // #3963
-                    const timer = setInterval(() => {
-                        if (info.project['program']) {
-                            clearInterval(timer);
-                            info.project['program'].__vue__ = { language };
-                        }
-                    }, 50);
+const plugin = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)((ts, info) => {
+    const vueOptions = getVueCompilerOptions();
+    const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, () => info.languageServiceHost.getProjectVersion?.() ?? '', info.project.projectKind === ts.server.ProjectKind.Inferred
+        ? () => true
+        : fileName => {
+            const fileMap = new vue.FileMap(info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false);
+            for (const vueFileName of createLanguageServicePlugin_1.externalFiles.get(info.project) ?? []) {
+                fileMap.set(vueFileName, undefined);
+            }
+            return fileMap.has(fileName);
+        }, info.languageServiceHost.getCompilationSettings(), vueOptions);
+    return {
+        languagePlugins: [languagePlugin],
+        setup: language => {
+            server_1.projects.set(info.project, { info, language, vueOptions });
+            (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true, fileName => fileName);
+            (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
+            // #3963
+            const timer = setInterval(() => {
+                if (info.project['program']) {
+                    clearInterval(timer);
+                    info.project['program'].__vue__ = { language };
                 }
-                return info.languageService;
-                function getVueCompilerOptions() {
-                    if (info.project.projectKind === ts.server.ProjectKind.Configured) {
-                        const tsconfig = info.project.getProjectName();
-                        return vue.createParsedCommandLine(ts, ts.sys, tsconfig.replace(windowsPathReg, '/')).vueOptions;
-                    }
-                    else {
-                        return vue.createParsedCommandLineByJson(ts, ts.sys, info.languageServiceHost.getCurrentDirectory(), {}).vueOptions;
-                    }
-                }
-            },
-            getExternalFiles(project, updateLevel = 0) {
-                if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
-                    const newFiles = new Set((0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project)));
-                    externalFiles.set(project, newFiles);
-                    if (oldFiles && !twoSetsEqual(oldFiles, newFiles)) {
-                        for (const oldFile of oldFiles) {
-                            if (!newFiles.has(oldFile)) {
-                                server_1.projects.get(project)?.language.scripts.delete(oldFile);
-                            }
-                        }
-                        project.refreshDiagnostics();
-                    }
-                }
-                return [...externalFiles.get(project)];
-            },
-        };
-        return pluginModule;
+            }, 50);
+        }
     };
-}
-function twoSetsEqual(a, b) {
-    if (a.size !== b.size) {
-        return false;
-    }
-    for (const file of a) {
-        if (!b.has(file)) {
-            return false;
+    function getVueCompilerOptions() {
+        if (info.project.projectKind === ts.server.ProjectKind.Configured) {
+            const tsconfig = info.project.getProjectName();
+            return vue.createParsedCommandLine(ts, ts.sys, tsconfig.replace(windowsPathReg, '/')).vueOptions;
+        }
+        else {
+            return vue.createParsedCommandLineByJson(ts, ts.sys, info.languageServiceHost.getCurrentDirectory(), {}).vueOptions;
         }
     }
-    return true;
-}
-module.exports = createLanguageServicePlugin();
+});
+module.exports = plugin;
 //# sourceMappingURL=index.js.map

package/lib/common.d.ts

@@ -1,7 +1,5 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceForVue(language: vue.Language, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean, getScriptId: (fileName: string) => string): void;
-export declare function getComponentSpans(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-}, vueCode: vue.VueVirtualCode, template: NonNullable<vue.VueVirtualCode['sfc']['template']>, spanTemplateRange: ts.TextSpan): ts.TextSpan[];
+import type { RequestContext } from './requests/types';
+export declare function decorateLanguageServiceForVue<T>(language: vue.Language<T>, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean, getScriptId: (fileName: string) => T): void;
+export declare function getComponentSpans(this: Pick<RequestContext, 'typescript' | 'languageService'>, vueCode: vue.VueVirtualCode, template: NonNullable<vue.VueVirtualCode['sfc']['template']>, spanTemplateRange: ts.TextSpan): ts.TextSpan[];

package/lib/common.js

@@ -134,11 +134,12 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
             if (file?.generated?.root instanceof vue.VueVirtualCode) {
                 const { template } = file.generated.root.sfc;
                 if (template) {
-                    for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService, vueOptions }, file.generated.root, template, {
+                    for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService }, file.generated.root, template, {
                         start: span.start - template.startTagEnd,
                         length: span.length,
                     })) {
-                        result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256);
+                        result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256 // class
+                        );
                     }
                 }
             }

package/lib/requests/collectExtractProps.js

@@ -16,7 +16,7 @@ function collectExtractProps(fileName, templateCodeRange) {
     const sourceFile = program.getSourceFile(fileName);
     const checker = program.getTypeChecker();
     const script = volarFile.generated?.languagePlugin.typescript?.getServiceScript(volarFile.generated.root);
-    const maps = script ? [...language.maps.forEach(script.code).values()] : [];
+    const maps = script ? [...language.maps.forEach(script.code)].map(([_1, _2, map]) => map) : [];
     const sfc = volarFile.generated.root.sfc;
     sourceFile.forEachChild(function visit(node) {
         if (ts.isPropertyAccessExpression(node)
@@ -24,25 +24,30 @@ function collectExtractProps(fileName, templateCodeRange) {
             && node.expression.text === '__VLS_ctx'
             && ts.isIdentifier(node.name)) {
             const { name } = node;
-            for (const [_, map] of maps) {
-                const source = map.getSourceOffset(name.getEnd() - (isTsPlugin ? volarFile.snapshot.getLength() : 0));
-                if (source
-                    && source[0] >= sfc.template.startTagEnd + templateCodeRange[0]
-                    && source[0] <= sfc.template.startTagEnd + templateCodeRange[1]
-                    && (0, language_core_1.isSemanticTokensEnabled)(source[1].data)) {
-                    if (!result.has(name.text)) {
-                        const type = checker.getTypeAtLocation(node);
-                        const typeString = checker.typeToString(type, node, ts.TypeFormatFlags.NoTruncation);
-                        result.set(name.text, {
-                            name: name.text,
-                            type: typeString.includes('__VLS_') ? 'any' : typeString,
-                            model: false,
-                        });
-                    }
-                    const isModel = ts.isPostfixUnaryExpression(node.parent) || ts.isBinaryExpression(node.parent);
-                    if (isModel) {
-                        result.get(name.text).model = true;
+            for (const map of maps) {
+                let mapped = false;
+                for (const source of map.getSourceOffsets(name.getEnd() - (isTsPlugin ? volarFile.snapshot.getLength() : 0))) {
+                    if (source[0] >= sfc.template.startTagEnd + templateCodeRange[0]
+                        && source[0] <= sfc.template.startTagEnd + templateCodeRange[1]
+                        && (0, language_core_1.isSemanticTokensEnabled)(source[1].data)) {
+                        mapped = true;
+                        if (!result.has(name.text)) {
+                            const type = checker.getTypeAtLocation(node);
+                            const typeString = checker.typeToString(type, node, ts.TypeFormatFlags.NoTruncation);
+                            result.set(name.text, {
+                                name: name.text,
+                                type: typeString.includes('__VLS_') ? 'any' : typeString,
+                                model: false,
+                            });
+                        }
+                        const isModel = ts.isPostfixUnaryExpression(node.parent) || ts.isBinaryExpression(node.parent);
+                        if (isModel) {
+                            result.get(name.text).model = true;
+                        }
+                        break;
                     }
+                }
+                if (mapped) {
                     break;
                 }
             }

package/lib/requests/componentInfos.d.ts

@@ -2,28 +2,8 @@ import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
 import type { RequestContext } from './types';
 export declare function getComponentProps(this: RequestContext, fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
-export declare function getComponentEvents(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: vue.Language;
-    getFileId: (fileName: string) => string;
-}, fileName: string, tag: string): string[] | undefined;
-export declare function getTemplateContextProps(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: vue.Language;
-    getFileId: (fileName: string) => string;
-}, fileName: string): string[] | undefined;
-export declare function getComponentNames(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: vue.Language;
-    getFileId: (fileName: string) => string;
-}, fileName: string): string[] | undefined;
+export declare function getComponentEvents(this: RequestContext, fileName: string, tag: string): string[] | undefined;
+export declare function getTemplateContextProps(this: RequestContext, fileName: string): string[] | undefined;
+export declare function getComponentNames(this: RequestContext, fileName: string): string[] | undefined;
 export declare function _getComponentNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: vue.VueVirtualCode): string[];
-export declare function getElementAttrs(this: {
-    typescript: typeof import('typescript');
-    languageService: ts.LanguageService;
-    language: vue.Language;
-    getFileId: (fileName: string) => string;
-}, fileName: string, tagName: string): string[] | undefined;
+export declare function getElementAttrs(this: RequestContext, fileName: string, tagName: string): string[] | undefined;

package/lib/requests/getPropertiesAtLocation.js

@@ -12,7 +12,7 @@ function getPropertiesAtLocation(fileName, position) {
             return;
         }
         let mapped = false;
-        for (const [_1, [_2, map]] of language.maps.forEach(virtualScript.code)) {
+        for (const [_1, _2, map] of language.maps.forEach(virtualScript.code)) {
             for (const [position2, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
                     position = position2;

package/lib/requests/types.d.ts

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

package/lib/server.d.ts

@@ -7,6 +7,6 @@ export interface Request {
 export declare function startNamedPipeServer(ts: typeof import('typescript'), serverKind: ts.server.ProjectKind, currentDirectory: string): void;
 export declare const projects: Map<ts.server.Project, {
     info: ts.server.PluginCreateInfo;
-    language: Language;
+    language: Language<string>;
     vueOptions: VueCompilerOptions;
 }>;

package/lib/utils.d.ts

@@ -2,6 +2,7 @@
 import * as net from 'net';
 import type * as ts from 'typescript';
 import type { Request } from './server';
+export { TypeScriptProjectHost } from '@volar/typescript';
 export interface NamedPipeServer {
     path: string;
     serverKind: ts.server.ProjectKind;

package/lib/utils.js

@@ -5,6 +5,7 @@ const os = require("os");
 const net = require("net");
 const path = require("path");
 const fs = require("fs");
+var typescript_1 = require("@volar/typescript");
 const { version } = require('../package.json');
 const pipeTableFile = path.join(os.tmpdir(), `vue-tsp-table-${version}.json`);
 function readPipeTable() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.19",
+	"version": "2.0.21",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.2.4",
-		"@vue/language-core": "2.0.19",
+		"@volar/typescript": "~2.3.0-alpha.15",
+		"@vue/language-core": "2.0.21",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "a9fae154ad1efc4359866cfd10251d53e4b0faed"
+	"gitHead": "a5af80e3939a39694abd9dd09a5496bc5fbf6e06"
 }