@vue/typescript-plugin 2.0.21 → 2.0.22

package/lib/client.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.getImportPathForFile = exports.collectExtractProps = void 0;
+exports.collectExtractProps = collectExtractProps;
+exports.getImportPathForFile = getImportPathForFile;
+exports.getPropertiesAtLocation = getPropertiesAtLocation;
+exports.getQuickInfoAtPosition = getQuickInfoAtPosition;
+exports.getComponentProps = getComponentProps;
+exports.getComponentEvents = getComponentEvents;
+exports.getTemplateContextProps = getTemplateContextProps;
+exports.getComponentNames = getComponentNames;
+exports.getElementAttrs = getElementAttrs;
 const utils_1 = require("./utils");
 function collectExtractProps(...args) {
     return sendRequest({
@@ -8,28 +16,24 @@ function collectExtractProps(...args) {
         args,
     });
 }
-exports.collectExtractProps = collectExtractProps;
 async function getImportPathForFile(...args) {
     return await sendRequest({
         type: 'getImportPathForFile',
         args,
     });
 }
-exports.getImportPathForFile = getImportPathForFile;
 async function getPropertiesAtLocation(...args) {
     return await sendRequest({
         type: 'getPropertiesAtLocation',
         args,
     });
 }
-exports.getPropertiesAtLocation = getPropertiesAtLocation;
 function getQuickInfoAtPosition(...args) {
     return sendRequest({
         type: 'getQuickInfoAtPosition',
         args,
     });
 }
-exports.getQuickInfoAtPosition = getQuickInfoAtPosition;
 // Component Infos
 function getComponentProps(...args) {
     return sendRequest({
@@ -37,35 +41,30 @@ function getComponentProps(...args) {
         args,
     });
 }
-exports.getComponentProps = getComponentProps;
 function getComponentEvents(...args) {
     return sendRequest({
         type: 'getComponentEvents',
         args,
     });
 }
-exports.getComponentEvents = getComponentEvents;
 function getTemplateContextProps(...args) {
     return sendRequest({
         type: 'getTemplateContextProps',
         args,
     });
 }
-exports.getTemplateContextProps = getTemplateContextProps;
 function getComponentNames(...args) {
     return sendRequest({
         type: 'getComponentNames',
         args,
     });
 }
-exports.getComponentNames = getComponentNames;
 function getElementAttrs(...args) {
     return sendRequest({
         type: 'getElementAttrs',
         args,
     });
 }
-exports.getElementAttrs = getElementAttrs;
 async function sendRequest(request) {
     const server = (await (0, utils_1.searchNamedPipeServerForFile)(request.args[0]))?.server;
     if (!server) {

package/lib/common.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getComponentSpans = exports.decorateLanguageServiceForVue = void 0;
+exports.decorateLanguageServiceForVue = decorateLanguageServiceForVue;
+exports.getComponentSpans = getComponentSpans;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const componentInfos_1 = require("./requests/componentInfos");
@@ -147,7 +148,6 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
         };
     }
 }
-exports.decorateLanguageServiceForVue = decorateLanguageServiceForVue;
 function getComponentSpans(vueCode, template, spanTemplateRange) {
     const { typescript: ts, languageService } = this;
     const result = [];
@@ -181,5 +181,4 @@ function getComponentSpans(vueCode, template, spanTemplateRange) {
     }
     return result;
 }
-exports.getComponentSpans = getComponentSpans;
 //# sourceMappingURL=common.js.map

package/lib/requests/collectExtractProps.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectExtractProps = void 0;
+exports.collectExtractProps = collectExtractProps;
 const language_core_1 = require("@vue/language-core");
 function collectExtractProps(fileName, templateCodeRange) {
     const { typescript: ts, languageService, language, isTsPlugin, getFileId } = this;
@@ -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)].map(([_1, _2, map]) => map) : [];
+    const maps = script ? [...language.maps.forEach(script.code)].map(([_sourceScript, map]) => map) : [];
     const sfc = volarFile.generated.root.sfc;
     sourceFile.forEachChild(function visit(node) {
         if (ts.isPropertyAccessExpression(node)
@@ -26,7 +26,7 @@ function collectExtractProps(fileName, templateCodeRange) {
             const { name } = node;
             for (const map of maps) {
                 let mapped = false;
-                for (const source of map.getSourceOffsets(name.getEnd() - (isTsPlugin ? volarFile.snapshot.getLength() : 0))) {
+                for (const source of map.toSourceLocation(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)) {
@@ -56,5 +56,4 @@ function collectExtractProps(fileName, templateCodeRange) {
     });
     return [...result.values()];
 }
-exports.collectExtractProps = collectExtractProps;
 //# sourceMappingURL=collectExtractProps.js.map

package/lib/requests/componentInfos.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getElementAttrs = exports._getComponentNames = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = void 0;
+exports.getComponentProps = getComponentProps;
+exports.getComponentEvents = getComponentEvents;
+exports.getTemplateContextProps = getTemplateContextProps;
+exports.getComponentNames = getComponentNames;
+exports._getComponentNames = _getComponentNames;
+exports.getElementAttrs = getElementAttrs;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 function getComponentProps(fileName, tag, requiredOnly = false) {
@@ -69,7 +74,6 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
     }
     return [...result];
 }
-exports.getComponentProps = getComponentProps;
 function getComponentEvents(fileName, tag) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
@@ -130,7 +134,6 @@ function getComponentEvents(fileName, tag) {
     }
     return [...result];
 }
-exports.getComponentEvents = getComponentEvents;
 function getTemplateContextProps(fileName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
@@ -143,7 +146,6 @@ function getTemplateContextProps(fileName) {
         ?.getProperties()
         .map(c => c.name);
 }
-exports.getTemplateContextProps = getTemplateContextProps;
 function getComponentNames(fileName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
@@ -158,7 +160,6 @@ function getComponentNames(fileName) {
         .filter(entry => entry.indexOf('$') === -1 && !entry.startsWith('_'))
         ?? [];
 }
-exports.getComponentNames = getComponentNames;
 function _getComponentNames(ts, tsLs, vueCode) {
     return getVariableType(ts, tsLs, vueCode, '__VLS_components')
         ?.type
@@ -167,7 +168,6 @@ function _getComponentNames(ts, tsLs, vueCode) {
         .filter(entry => entry.indexOf('$') === -1 && !entry.startsWith('_'))
         ?? [];
 }
-exports._getComponentNames = _getComponentNames;
 function getElementAttrs(fileName, tagName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
@@ -193,7 +193,6 @@ function getElementAttrs(fileName, tagName) {
     }
     return [];
 }
-exports.getElementAttrs = getElementAttrs;
 function getVariableType(ts, tsLs, vueCode, name) {
     const program = tsLs.getCurrentProgram();
     if (!program) {

package/lib/requests/getImportPathForFile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImportPathForFile = void 0;
+exports.getImportPathForFile = getImportPathForFile;
 function getImportPathForFile(fileName, incomingFileName, preferences) {
     const { typescript: ts, languageService, languageServiceHost } = this;
     const program = languageService.getProgram();
@@ -16,5 +16,4 @@ function getImportPathForFile(fileName, incomingFileName, preferences) {
         return moduleSpecifier;
     }
 }
-exports.getImportPathForFile = getImportPathForFile;
 //# sourceMappingURL=getImportPathForFile.js.map

package/lib/requests/getPropertiesAtLocation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPropertiesAtLocation = void 0;
+exports.getPropertiesAtLocation = getPropertiesAtLocation;
 const language_core_1 = require("@vue/language-core");
 function getPropertiesAtLocation(fileName, position) {
     const { languageService, language, typescript: ts, isTsPlugin, getFileId } = this;
@@ -12,8 +12,8 @@ function getPropertiesAtLocation(fileName, position) {
             return;
         }
         let mapped = false;
-        for (const [_1, _2, map] of language.maps.forEach(virtualScript.code)) {
-            for (const [position2, mapping] of map.getGeneratedOffsets(position)) {
+        for (const [_sourceScript, map] of language.maps.forEach(virtualScript.code)) {
+            for (const [position2, mapping] of map.toGeneratedLocation(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
                     position = position2;
                     mapped = true;
@@ -62,5 +62,4 @@ function getPropertiesAtLocation(fileName, position) {
         return result;
     }
 }
-exports.getPropertiesAtLocation = getPropertiesAtLocation;
 //# sourceMappingURL=getPropertiesAtLocation.js.map

package/lib/requests/getQuickInfoAtPosition.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQuickInfoAtPosition = void 0;
+exports.getQuickInfoAtPosition = getQuickInfoAtPosition;
 function getQuickInfoAtPosition(fileName, position) {
     const { languageService } = this;
     return languageService.getQuickInfoAtPosition(fileName, position);
 }
-exports.getQuickInfoAtPosition = getQuickInfoAtPosition;
 //# sourceMappingURL=getQuickInfoAtPosition.js.map

package/lib/server.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projects = exports.startNamedPipeServer = void 0;
+exports.projects = void 0;
+exports.startNamedPipeServer = startNamedPipeServer;
 const fs = require("fs");
 const net = require("net");
 const collectExtractProps_1 = require("./requests/collectExtractProps");
@@ -103,7 +104,6 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
     catch { }
     server.listen(pipeFile);
 }
-exports.startNamedPipeServer = startNamedPipeServer;
 function cleanupPipeTable() {
     for (const server of (0, utils_1.readPipeTable)()) {
         (0, utils_1.connect)(server.path).then(client => {

package/lib/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as net from 'net';
 import type * as ts from 'typescript';
 import type { Request } from './server';

package/lib/utils.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendRequestWorker = exports.searchNamedPipeServerForFile = exports.connect = exports.updatePipeTable = exports.readPipeTable = void 0;
+exports.readPipeTable = readPipeTable;
+exports.updatePipeTable = updatePipeTable;
+exports.connect = connect;
+exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
+exports.sendRequestWorker = sendRequestWorker;
 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() {
@@ -21,7 +24,6 @@ function readPipeTable() {
         return [];
     }
 }
-exports.readPipeTable = readPipeTable;
 function updatePipeTable(servers) {
     if (servers.length === 0) {
         fs.unlinkSync(pipeTableFile);
@@ -30,7 +32,6 @@ function updatePipeTable(servers) {
         fs.writeFileSync(pipeTableFile, JSON.stringify(servers, undefined, 2));
     }
 }
-exports.updatePipeTable = updatePipeTable;
 function connect(path) {
     return new Promise(resolve => {
         const client = net.connect(path);
@@ -46,7 +47,6 @@ function connect(path) {
         });
     });
 }
-exports.connect = connect;
 async function searchNamedPipeServerForFile(fileName) {
     const servers = readPipeTable();
     const configuredServers = servers
@@ -78,7 +78,6 @@ async function searchNamedPipeServerForFile(fileName) {
         }
     }
 }
-exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
 function sortTSConfigs(file, a, b) {
     const inA = isFileInDir(file, path.dirname(a));
     const inB = isFileInDir(file, path.dirname(b));
@@ -132,5 +131,4 @@ function sendRequestWorker(request, client) {
         client.write(JSON.stringify(request));
     });
 }
-exports.sendRequestWorker = sendRequestWorker;
 //# sourceMappingURL=utils.js.map

package/package.json

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