@vue/typescript-plugin 3.0.0-alpha.6 → 3.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +2 -2
- package/lib/common.d.ts +1 -1
- package/lib/common.js +2 -2
- package/lib/requests/collectExtractProps.js +2 -2
- package/lib/requests/getComponentDirectives.js +11 -3
- package/lib/requests/getComponentEvents.js +2 -2
- package/lib/requests/getComponentNames.js +2 -2
- package/lib/requests/getComponentProps.js +2 -2
- package/lib/requests/getElementAttrs.js +2 -2
- package/lib/requests/getElementNames.js +2 -2
- package/lib/requests/getPropertiesAtLocation.js +2 -2
- package/lib/requests/types.d.ts +1 -1
- package/package.json +4 -4
- package/lib/client.d.ts +0 -13
- package/lib/client.js +0 -42
- package/lib/requests/getQuickInfoAtPosition.d.ts +0 -2
- package/lib/requests/getQuickInfoAtPosition.js +0 -8
- package/lib/server.d.ts +0 -25
- package/lib/server.js +0 -260
- package/lib/utils.d.ts +0 -31
- package/lib/utils.js +0 -250
package/index.js
CHANGED
|
@@ -21,7 +21,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
|
|
|
21
21
|
languagePlugins: [languagePlugin],
|
|
22
22
|
setup: language => {
|
|
23
23
|
project2Service.set(info.project, [language, info.languageServiceHost, info.languageService]);
|
|
24
|
-
info.languageService = (0, common_1.
|
|
24
|
+
info.languageService = (0, common_1.createVueLanguageServiceProxy)(ts, language, info.languageService, vueOptions, fileName => fileName);
|
|
25
25
|
// #3963
|
|
26
26
|
const timer = setInterval(() => {
|
|
27
27
|
if (info.project['program']) {
|
|
@@ -120,7 +120,7 @@ module.exports = (0, createLanguageServicePlugin_1.createLanguageServicePlugin)(
|
|
|
120
120
|
languageServiceHost: service[1],
|
|
121
121
|
language: service[0],
|
|
122
122
|
isTsPlugin: true,
|
|
123
|
-
|
|
123
|
+
asScriptId: (fileName) => fileName,
|
|
124
124
|
};
|
|
125
125
|
}
|
|
126
126
|
});
|
package/lib/common.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type Language, type VueCompilerOptions } from '@vue/language-core';
|
|
2
2
|
import type * as ts from 'typescript';
|
|
3
|
-
export declare function
|
|
3
|
+
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
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createVueLanguageServiceProxy = createVueLanguageServiceProxy;
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
const shared_1 = require("@vue/shared");
|
|
6
6
|
const getComponentNames_1 = require("./requests/getComponentNames");
|
|
7
7
|
const getElementNames_1 = require("./requests/getElementNames");
|
|
8
8
|
const windowsPathReg = /\\/g;
|
|
9
|
-
function
|
|
9
|
+
function createVueLanguageServiceProxy(ts, language, languageService, vueOptions, asScriptId) {
|
|
10
10
|
const proxyCache = new Map();
|
|
11
11
|
const getProxyMethod = (target, p) => {
|
|
12
12
|
switch (p) {
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.collectExtractProps = collectExtractProps;
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
function collectExtractProps(fileName, templateCodeRange) {
|
|
6
|
-
const { typescript: ts, languageService, language, isTsPlugin,
|
|
7
|
-
const sourceScript = language.scripts.get(
|
|
6
|
+
const { typescript: ts, languageService, language, isTsPlugin, asScriptId } = this;
|
|
7
|
+
const sourceScript = language.scripts.get(asScriptId(fileName));
|
|
8
8
|
if (!sourceScript?.generated) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
@@ -3,9 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getComponentDirectives = getComponentDirectives;
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
+
const builtInDirectives = new Set([
|
|
7
|
+
'vBind',
|
|
8
|
+
'vIf',
|
|
9
|
+
'vOn',
|
|
10
|
+
'vOnce',
|
|
11
|
+
'vShow',
|
|
12
|
+
'vSlot',
|
|
13
|
+
]);
|
|
6
14
|
function getComponentDirectives(fileName) {
|
|
7
|
-
const { typescript: ts, language, languageService,
|
|
8
|
-
const volarFile = language.scripts.get(
|
|
15
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
16
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
9
17
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
10
18
|
return;
|
|
11
19
|
}
|
|
@@ -17,6 +25,6 @@ function getComponentDirectives(fileName) {
|
|
|
17
25
|
return directives.type.getProperties()
|
|
18
26
|
.map(({ name }) => name)
|
|
19
27
|
.filter(name => name.startsWith('v') && name.length >= 2 && name[1] === name[1].toUpperCase())
|
|
20
|
-
.filter(name => !
|
|
28
|
+
.filter(name => !builtInDirectives.has(name));
|
|
21
29
|
}
|
|
22
30
|
//# sourceMappingURL=getComponentDirectives.js.map
|
|
@@ -4,8 +4,8 @@ exports.getComponentEvents = getComponentEvents;
|
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
function getComponentEvents(fileName, tag) {
|
|
7
|
-
const { typescript: ts, language, languageService,
|
|
8
|
-
const volarFile = language.scripts.get(
|
|
7
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
8
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
9
9
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
@@ -5,8 +5,8 @@ exports._getComponentNames = _getComponentNames;
|
|
|
5
5
|
const language_core_1 = require("@vue/language-core");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
function getComponentNames(fileName) {
|
|
8
|
-
const { typescript: ts, language, languageService,
|
|
9
|
-
const volarFile = language.scripts.get(
|
|
8
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
9
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
10
10
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
@@ -4,8 +4,8 @@ exports.getComponentProps = getComponentProps;
|
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
function getComponentProps(fileName, tag) {
|
|
7
|
-
const { typescript: ts, language, languageService,
|
|
8
|
-
const volarFile = language.scripts.get(
|
|
7
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
8
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
9
9
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
@@ -4,8 +4,8 @@ exports.getElementAttrs = getElementAttrs;
|
|
|
4
4
|
const language_core_1 = require("@vue/language-core");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
function getElementAttrs(fileName, tagName) {
|
|
7
|
-
const { typescript: ts, language, languageService,
|
|
8
|
-
const volarFile = language.scripts.get(
|
|
7
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
8
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
9
9
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
@@ -5,8 +5,8 @@ exports._getElementNames = _getElementNames;
|
|
|
5
5
|
const language_core_1 = require("@vue/language-core");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
function getElementNames(fileName) {
|
|
8
|
-
const { typescript: ts, language, languageService,
|
|
9
|
-
const volarFile = language.scripts.get(
|
|
8
|
+
const { typescript: ts, language, languageService, asScriptId } = this;
|
|
9
|
+
const volarFile = language.scripts.get(asScriptId(fileName));
|
|
10
10
|
if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.getPropertiesAtLocation = getPropertiesAtLocation;
|
|
5
5
|
const language_core_1 = require("@vue/language-core");
|
|
6
6
|
function getPropertiesAtLocation(fileName, position) {
|
|
7
|
-
const { languageService, language, typescript: ts, isTsPlugin,
|
|
7
|
+
const { languageService, language, typescript: ts, isTsPlugin, asScriptId } = this;
|
|
8
8
|
// mapping
|
|
9
|
-
const file = language.scripts.get(
|
|
9
|
+
const file = language.scripts.get(asScriptId(fileName));
|
|
10
10
|
if (file?.generated) {
|
|
11
11
|
const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
|
|
12
12
|
if (!virtualScript) {
|
package/lib/requests/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vue/typescript-plugin",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-beta.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"**/*.js",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"directory": "packages/typescript-plugin"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@volar/typescript": "
|
|
17
|
-
"@vue/language-core": "3.0.0-
|
|
16
|
+
"@volar/typescript": "2.4.14",
|
|
17
|
+
"@vue/language-core": "3.0.0-beta.1",
|
|
18
18
|
"@vue/shared": "^3.5.0",
|
|
19
19
|
"path-browserify": "^1.0.1"
|
|
20
20
|
},
|
|
@@ -22,5 +22,5 @@
|
|
|
22
22
|
"@types/node": "^22.10.4",
|
|
23
23
|
"@types/path-browserify": "^1.0.1"
|
|
24
24
|
},
|
|
25
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "7a2ea48123679387d7095a81ac49cfc667aeeabb"
|
|
26
26
|
}
|
package/lib/client.d.ts
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
export declare const collectExtractProps: (fileName: string, templateCodeRange: [number, number]) => Promise<{
|
|
2
|
-
name: string;
|
|
3
|
-
type: string;
|
|
4
|
-
model: boolean;
|
|
5
|
-
}[] | null | undefined>;
|
|
6
|
-
export declare const getImportPathForFile: (fileName: string, incomingFileName: string, preferences: import("typescript").UserPreferences) => Promise<string | null | undefined>;
|
|
7
|
-
export declare const getPropertiesAtLocation: (fileName: string, position: number) => Promise<string[] | null | undefined>;
|
|
8
|
-
export declare const getQuickInfoAtPosition: (fileName: string, position: number) => Promise<string | null | undefined>;
|
|
9
|
-
export declare function getComponentProps(fileName: string, componentName: string): Promise<import("./requests/getComponentProps").ComponentPropInfo[] | null | undefined>;
|
|
10
|
-
export declare const getComponentEvents: (fileName: string, tag: string) => Promise<string[] | null | undefined>;
|
|
11
|
-
export declare const getComponentDirectives: (fileName: string) => Promise<string[] | null | undefined>;
|
|
12
|
-
export declare function getComponentNames(fileName: string): Promise<string[] | undefined>;
|
|
13
|
-
export declare const getElementAttrs: (fileName: string, tagName: string) => Promise<string[] | null | undefined>;
|
package/lib/client.js
DELETED
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getElementAttrs = exports.getComponentDirectives = exports.getComponentEvents = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.getImportPathForFile = exports.collectExtractProps = void 0;
|
|
4
|
-
exports.getComponentProps = getComponentProps;
|
|
5
|
-
exports.getComponentNames = getComponentNames;
|
|
6
|
-
const utils_1 = require("./utils");
|
|
7
|
-
exports.collectExtractProps = createRequest('collectExtractProps');
|
|
8
|
-
exports.getImportPathForFile = createRequest('getImportPathForFile');
|
|
9
|
-
exports.getPropertiesAtLocation = createRequest('getPropertiesAtLocation');
|
|
10
|
-
exports.getQuickInfoAtPosition = createRequest('getQuickInfoAtPosition');
|
|
11
|
-
// Component Infos
|
|
12
|
-
async function getComponentProps(fileName, componentName) {
|
|
13
|
-
const server = await (0, utils_1.getBestServer)(fileName);
|
|
14
|
-
if (!server) {
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
return await server.getComponentProps(fileName, componentName);
|
|
18
|
-
}
|
|
19
|
-
exports.getComponentEvents = createRequest('getComponentEvents');
|
|
20
|
-
exports.getComponentDirectives = createRequest('getComponentDirectives');
|
|
21
|
-
async function getComponentNames(fileName) {
|
|
22
|
-
const server = await (0, utils_1.getBestServer)(fileName);
|
|
23
|
-
if (!server) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
const componentAndProps = server.componentNamesAndProps.get(fileName);
|
|
27
|
-
if (!componentAndProps) {
|
|
28
|
-
return;
|
|
29
|
-
}
|
|
30
|
-
return Object.keys(componentAndProps);
|
|
31
|
-
}
|
|
32
|
-
exports.getElementAttrs = createRequest('getElementAttrs');
|
|
33
|
-
function createRequest(requestType) {
|
|
34
|
-
return async function (...[fileName, ...rest]) {
|
|
35
|
-
const server = await (0, utils_1.getBestServer)(fileName);
|
|
36
|
-
if (!server) {
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
return server.sendRequest(requestType, fileName, ...rest);
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
//# sourceMappingURL=client.js.map
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getQuickInfoAtPosition = getQuickInfoAtPosition;
|
|
4
|
-
function getQuickInfoAtPosition(fileName, position) {
|
|
5
|
-
const { typescript: ts, languageService } = this;
|
|
6
|
-
return ts.displayPartsToString(languageService.getQuickInfoAtPosition(fileName, position)?.displayParts ?? []);
|
|
7
|
-
}
|
|
8
|
-
//# sourceMappingURL=getQuickInfoAtPosition.js.map
|
package/lib/server.d.ts
DELETED
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { Language } from '@vue/language-core';
|
|
2
|
-
import type * as ts from 'typescript';
|
|
3
|
-
export type RequestType = 'containsFile' | 'projectInfo' | 'collectExtractProps' | 'getImportPathForFile' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'subscribeComponentProps' | 'getComponentEvents' | 'getComponentDirectives' | 'getElementAttrs';
|
|
4
|
-
export type NotificationType = 'componentNamesUpdated' | 'componentPropsUpdated';
|
|
5
|
-
export type RequestData = [
|
|
6
|
-
seq: number,
|
|
7
|
-
type: RequestType,
|
|
8
|
-
fileName: string,
|
|
9
|
-
...args: any[]
|
|
10
|
-
];
|
|
11
|
-
export type ResponseData = [
|
|
12
|
-
seq: number,
|
|
13
|
-
data: any
|
|
14
|
-
];
|
|
15
|
-
export type NotificationData = [
|
|
16
|
-
type: NotificationType,
|
|
17
|
-
fileName: string,
|
|
18
|
-
data: any
|
|
19
|
-
];
|
|
20
|
-
export interface ProjectInfo {
|
|
21
|
-
name: string;
|
|
22
|
-
kind: ts.server.ProjectKind;
|
|
23
|
-
currentDirectory: string;
|
|
24
|
-
}
|
|
25
|
-
export declare function startNamedPipeServer(ts: typeof import('typescript'), info: ts.server.PluginCreateInfo, language: Language<string>, projectKind: ts.server.ProjectKind.Inferred | ts.server.ProjectKind.Configured): Promise<void>;
|
package/lib/server.js
DELETED
|
@@ -1,260 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.startNamedPipeServer = startNamedPipeServer;
|
|
4
|
-
const language_core_1 = require("@vue/language-core");
|
|
5
|
-
const fs = require("node:fs");
|
|
6
|
-
const net = require("node:net");
|
|
7
|
-
const collectExtractProps_1 = require("./requests/collectExtractProps");
|
|
8
|
-
const getComponentDirectives_1 = require("./requests/getComponentDirectives");
|
|
9
|
-
const getComponentEvents_1 = require("./requests/getComponentEvents");
|
|
10
|
-
const getComponentNames_1 = require("./requests/getComponentNames");
|
|
11
|
-
const getComponentProps_1 = require("./requests/getComponentProps");
|
|
12
|
-
const getElementAttrs_1 = require("./requests/getElementAttrs");
|
|
13
|
-
const getImportPathForFile_1 = require("./requests/getImportPathForFile");
|
|
14
|
-
const getPropertiesAtLocation_1 = require("./requests/getPropertiesAtLocation");
|
|
15
|
-
const getQuickInfoAtPosition_1 = require("./requests/getQuickInfoAtPosition");
|
|
16
|
-
const utils_1 = require("./utils");
|
|
17
|
-
async function startNamedPipeServer(ts, info, language, projectKind) {
|
|
18
|
-
let lastProjectVersion;
|
|
19
|
-
const requestContext = {
|
|
20
|
-
typescript: ts,
|
|
21
|
-
languageService: info.languageService,
|
|
22
|
-
languageServiceHost: info.languageServiceHost,
|
|
23
|
-
language: language,
|
|
24
|
-
isTsPlugin: true,
|
|
25
|
-
getFileId: (fileName) => fileName,
|
|
26
|
-
};
|
|
27
|
-
const dataChunks = [];
|
|
28
|
-
const currentData = new language_core_1.FileMap(false);
|
|
29
|
-
const allConnections = new Set();
|
|
30
|
-
const pendingRequests = new Set();
|
|
31
|
-
const server = net.createServer(connection => {
|
|
32
|
-
allConnections.add(connection);
|
|
33
|
-
connection.on('end', () => {
|
|
34
|
-
allConnections.delete(connection);
|
|
35
|
-
});
|
|
36
|
-
connection.on('data', buffer => {
|
|
37
|
-
dataChunks.push(buffer);
|
|
38
|
-
const text = dataChunks.toString();
|
|
39
|
-
if (text.endsWith('\n\n')) {
|
|
40
|
-
dataChunks.length = 0;
|
|
41
|
-
const requests = text.split('\n\n');
|
|
42
|
-
for (let json of requests) {
|
|
43
|
-
json = json.trim();
|
|
44
|
-
if (!json) {
|
|
45
|
-
continue;
|
|
46
|
-
}
|
|
47
|
-
try {
|
|
48
|
-
onRequest(connection, JSON.parse(json));
|
|
49
|
-
}
|
|
50
|
-
catch (e) {
|
|
51
|
-
console.error('[Vue Named Pipe Server] JSON parse error:', e);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
connection.on('error', err => console.error('[Vue Named Pipe Server]', err.message));
|
|
57
|
-
for (const [fileName, [componentNames, componentProps]] of currentData) {
|
|
58
|
-
notify(connection, 'componentNamesUpdated', fileName, componentNames);
|
|
59
|
-
for (const [name, props] of Object.entries(componentProps)) {
|
|
60
|
-
notify(connection, 'componentPropsUpdated', fileName, [name, props]);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
});
|
|
64
|
-
for (let i = 0; i < 10; i++) {
|
|
65
|
-
const path = (0, utils_1.getServerPath)(projectKind, i);
|
|
66
|
-
const socket = await connect(path, 100);
|
|
67
|
-
if (typeof socket === 'object') {
|
|
68
|
-
socket.end();
|
|
69
|
-
}
|
|
70
|
-
const namedPipeOccupied = typeof socket === 'object' || socket === 'timeout';
|
|
71
|
-
if (namedPipeOccupied) {
|
|
72
|
-
continue;
|
|
73
|
-
}
|
|
74
|
-
const success = await tryListen(server, path);
|
|
75
|
-
if (success) {
|
|
76
|
-
break;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
updateWhile();
|
|
80
|
-
async function updateWhile() {
|
|
81
|
-
while (true) {
|
|
82
|
-
await sleep(500);
|
|
83
|
-
const projectVersion = info.project.getProjectVersion();
|
|
84
|
-
if (lastProjectVersion === projectVersion) {
|
|
85
|
-
continue;
|
|
86
|
-
}
|
|
87
|
-
const connections = [...allConnections].filter(c => !c.destroyed);
|
|
88
|
-
if (!connections.length) {
|
|
89
|
-
continue;
|
|
90
|
-
}
|
|
91
|
-
const token = info.languageServiceHost.getCancellationToken?.();
|
|
92
|
-
const openedScriptInfos = info.project.getRootScriptInfos().filter(info => info.isScriptOpen());
|
|
93
|
-
if (!openedScriptInfos.length) {
|
|
94
|
-
continue;
|
|
95
|
-
}
|
|
96
|
-
for (const scriptInfo of openedScriptInfos) {
|
|
97
|
-
await sleep(10);
|
|
98
|
-
if (token?.isCancellationRequested()) {
|
|
99
|
-
break;
|
|
100
|
-
}
|
|
101
|
-
let data = currentData.get(scriptInfo.fileName);
|
|
102
|
-
if (!data) {
|
|
103
|
-
data = [[], {}];
|
|
104
|
-
currentData.set(scriptInfo.fileName, data);
|
|
105
|
-
}
|
|
106
|
-
const [oldComponentNames, componentProps] = data;
|
|
107
|
-
const newComponentNames = getComponentNames_1.getComponentNames.apply(requestContext, [scriptInfo.fileName]) ?? [];
|
|
108
|
-
if (JSON.stringify(oldComponentNames) !== JSON.stringify(newComponentNames)) {
|
|
109
|
-
data[0] = newComponentNames;
|
|
110
|
-
for (const connection of connections) {
|
|
111
|
-
notify(connection, 'componentNamesUpdated', scriptInfo.fileName, newComponentNames);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
for (const [name, props] of Object.entries(componentProps)) {
|
|
115
|
-
await sleep(10);
|
|
116
|
-
if (token?.isCancellationRequested()) {
|
|
117
|
-
break;
|
|
118
|
-
}
|
|
119
|
-
const newProps = getComponentProps_1.getComponentProps.apply(requestContext, [scriptInfo.fileName, name]) ?? [];
|
|
120
|
-
if (JSON.stringify(props) !== JSON.stringify(newProps)) {
|
|
121
|
-
componentProps[name] = newProps;
|
|
122
|
-
for (const connection of connections) {
|
|
123
|
-
notify(connection, 'componentPropsUpdated', scriptInfo.fileName, [name, newProps]);
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
lastProjectVersion = projectVersion;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
function sleep(ms) {
|
|
132
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
133
|
-
}
|
|
134
|
-
function notify(connection, type, fileName, data) {
|
|
135
|
-
connection.write(JSON.stringify([type, fileName, data]) + '\n\n');
|
|
136
|
-
}
|
|
137
|
-
function onRequest(connection, [seq, requestType, ...args]) {
|
|
138
|
-
if (pendingRequests.has(seq)) {
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
setTimeout(() => pendingRequests.delete(seq), 500);
|
|
142
|
-
pendingRequests.add(seq);
|
|
143
|
-
let data;
|
|
144
|
-
try {
|
|
145
|
-
data = handleRequest(requestType, ...args);
|
|
146
|
-
}
|
|
147
|
-
catch {
|
|
148
|
-
data = null;
|
|
149
|
-
}
|
|
150
|
-
connection.write(JSON.stringify([seq, data ?? null]) + '\n\n');
|
|
151
|
-
}
|
|
152
|
-
function handleRequest(requestType, ...args) {
|
|
153
|
-
const fileName = args[0];
|
|
154
|
-
if (requestType === 'projectInfo') {
|
|
155
|
-
return {
|
|
156
|
-
name: info.project.getProjectName(),
|
|
157
|
-
kind: info.project.projectKind,
|
|
158
|
-
currentDirectory: info.project.getCurrentDirectory(),
|
|
159
|
-
};
|
|
160
|
-
}
|
|
161
|
-
else if (requestType === 'containsFile') {
|
|
162
|
-
return info.project.containsFile(ts.server.toNormalizedPath(fileName));
|
|
163
|
-
}
|
|
164
|
-
else if (requestType === 'collectExtractProps') {
|
|
165
|
-
return collectExtractProps_1.collectExtractProps.apply(requestContext, args);
|
|
166
|
-
}
|
|
167
|
-
else if (requestType === 'getImportPathForFile') {
|
|
168
|
-
return getImportPathForFile_1.getImportPathForFile.apply(requestContext, args);
|
|
169
|
-
}
|
|
170
|
-
else if (requestType === 'getPropertiesAtLocation') {
|
|
171
|
-
return getPropertiesAtLocation_1.getPropertiesAtLocation.apply(requestContext, args);
|
|
172
|
-
}
|
|
173
|
-
else if (requestType === 'getQuickInfoAtPosition') {
|
|
174
|
-
return getQuickInfoAtPosition_1.getQuickInfoAtPosition.apply(requestContext, args);
|
|
175
|
-
}
|
|
176
|
-
else if (requestType === 'subscribeComponentProps') {
|
|
177
|
-
const tag = args[1];
|
|
178
|
-
const props = getComponentProps_1.getComponentProps.apply(requestContext, [fileName, tag]) ?? [];
|
|
179
|
-
let data = currentData.get(fileName);
|
|
180
|
-
if (!data) {
|
|
181
|
-
data = [[], {}];
|
|
182
|
-
currentData.set(fileName, data);
|
|
183
|
-
}
|
|
184
|
-
data[1][tag] = props;
|
|
185
|
-
return props;
|
|
186
|
-
}
|
|
187
|
-
else if (requestType === 'getComponentEvents') {
|
|
188
|
-
return getComponentEvents_1.getComponentEvents.apply(requestContext, args);
|
|
189
|
-
}
|
|
190
|
-
else if (requestType === 'getComponentDirectives') {
|
|
191
|
-
return getComponentDirectives_1.getComponentDirectives.apply(requestContext, args);
|
|
192
|
-
}
|
|
193
|
-
else if (requestType === 'getElementAttrs') {
|
|
194
|
-
return getElementAttrs_1.getElementAttrs.apply(requestContext, args);
|
|
195
|
-
}
|
|
196
|
-
console.warn('[Vue Named Pipe Server] Unknown request:', requestType);
|
|
197
|
-
debugger;
|
|
198
|
-
return undefined;
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
function connect(namedPipePath, timeout) {
|
|
202
|
-
return new Promise(resolve => {
|
|
203
|
-
const socket = net.connect(namedPipePath);
|
|
204
|
-
if (timeout) {
|
|
205
|
-
socket.setTimeout(timeout);
|
|
206
|
-
}
|
|
207
|
-
const onConnect = () => {
|
|
208
|
-
cleanup();
|
|
209
|
-
resolve(socket);
|
|
210
|
-
};
|
|
211
|
-
const onError = (err) => {
|
|
212
|
-
if (err.code === 'ECONNREFUSED') {
|
|
213
|
-
try {
|
|
214
|
-
console.log('[Vue Named Pipe Client] Deleting:', namedPipePath);
|
|
215
|
-
fs.promises.unlink(namedPipePath);
|
|
216
|
-
}
|
|
217
|
-
catch { }
|
|
218
|
-
}
|
|
219
|
-
cleanup();
|
|
220
|
-
resolve('error');
|
|
221
|
-
socket.end();
|
|
222
|
-
};
|
|
223
|
-
const onTimeout = () => {
|
|
224
|
-
cleanup();
|
|
225
|
-
resolve('timeout');
|
|
226
|
-
socket.end();
|
|
227
|
-
};
|
|
228
|
-
const cleanup = () => {
|
|
229
|
-
socket.off('connect', onConnect);
|
|
230
|
-
socket.off('error', onError);
|
|
231
|
-
socket.off('timeout', onTimeout);
|
|
232
|
-
};
|
|
233
|
-
socket.on('connect', onConnect);
|
|
234
|
-
socket.on('error', onError);
|
|
235
|
-
socket.on('timeout', onTimeout);
|
|
236
|
-
});
|
|
237
|
-
}
|
|
238
|
-
function tryListen(server, namedPipePath) {
|
|
239
|
-
return new Promise(resolve => {
|
|
240
|
-
const onSuccess = () => {
|
|
241
|
-
server.off('error', onError);
|
|
242
|
-
resolve(true);
|
|
243
|
-
};
|
|
244
|
-
const onError = (err) => {
|
|
245
|
-
if (err.code === 'ECONNREFUSED') {
|
|
246
|
-
try {
|
|
247
|
-
console.log('[Vue Named Pipe Client] Deleting:', namedPipePath);
|
|
248
|
-
fs.promises.unlink(namedPipePath);
|
|
249
|
-
}
|
|
250
|
-
catch { }
|
|
251
|
-
}
|
|
252
|
-
server.off('error', onError);
|
|
253
|
-
server.close();
|
|
254
|
-
resolve(false);
|
|
255
|
-
};
|
|
256
|
-
server.listen(namedPipePath, onSuccess);
|
|
257
|
-
server.on('error', onError);
|
|
258
|
-
});
|
|
259
|
-
}
|
|
260
|
-
//# sourceMappingURL=server.js.map
|
package/lib/utils.d.ts
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { FileMap } from '@vue/language-core';
|
|
2
|
-
import * as net from 'node:net';
|
|
3
|
-
import type * as ts from 'typescript';
|
|
4
|
-
import type { ComponentPropInfo } from './requests/getComponentProps';
|
|
5
|
-
import type { NotificationData, ProjectInfo, RequestData } from './server';
|
|
6
|
-
export { TypeScriptProjectHost } from '@volar/typescript';
|
|
7
|
-
export declare function getServerPath(kind: ts.server.ProjectKind, id: number): string;
|
|
8
|
-
declare class NamedPipeServer {
|
|
9
|
-
path: string;
|
|
10
|
-
connecting: boolean;
|
|
11
|
-
projectInfo?: ProjectInfo;
|
|
12
|
-
containsFileCache: Map<string, Promise<boolean | null | undefined>>;
|
|
13
|
-
componentNamesAndProps: FileMap<Record<string, ComponentPropInfo[] | null>>;
|
|
14
|
-
constructor(kind: ts.server.ProjectKind, id: number);
|
|
15
|
-
containsFile(fileName: string): Promise<boolean | null | undefined> | undefined;
|
|
16
|
-
getComponentProps(fileName: string, tag: string): Promise<ComponentPropInfo[] | null | undefined>;
|
|
17
|
-
update(): void;
|
|
18
|
-
connect(): void;
|
|
19
|
-
close(): void;
|
|
20
|
-
socket?: net.Socket;
|
|
21
|
-
seq: number;
|
|
22
|
-
dataChunks: Buffer[];
|
|
23
|
-
requestHandlers: Map<number, (res: any) => void>;
|
|
24
|
-
onData(chunk: Buffer): void;
|
|
25
|
-
onNotification(type: NotificationData[0], fileName: string, data: any): void;
|
|
26
|
-
sendRequest<T>(requestType: RequestData[1], fileName: string, ...args: any[]): Promise<T | null | undefined>;
|
|
27
|
-
}
|
|
28
|
-
export declare const configuredServers: NamedPipeServer[];
|
|
29
|
-
export declare const inferredServers: NamedPipeServer[];
|
|
30
|
-
export declare const onServerReady: (() => void)[];
|
|
31
|
-
export declare function getBestServer(fileName: string): Promise<NamedPipeServer | undefined>;
|
package/lib/utils.js
DELETED
|
@@ -1,250 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.onServerReady = exports.inferredServers = exports.configuredServers = void 0;
|
|
4
|
-
exports.getServerPath = getServerPath;
|
|
5
|
-
exports.getBestServer = getBestServer;
|
|
6
|
-
const language_core_1 = require("@vue/language-core");
|
|
7
|
-
const shared_1 = require("@vue/shared");
|
|
8
|
-
const fs = require("node:fs");
|
|
9
|
-
const net = require("node:net");
|
|
10
|
-
const os = require("node:os");
|
|
11
|
-
const path = require("node:path");
|
|
12
|
-
const { version } = require('../package.json');
|
|
13
|
-
const platform = os.platform();
|
|
14
|
-
const pipeDir = platform === 'win32'
|
|
15
|
-
? `\\\\.\\pipe\\`
|
|
16
|
-
: `/tmp/`;
|
|
17
|
-
function getServerPath(kind, id) {
|
|
18
|
-
if (kind === 1) {
|
|
19
|
-
return `${pipeDir}vue-named-pipe-${version}-configured-${id}`;
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
return `${pipeDir}vue-named-pipe-${version}-inferred-${id}`;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
class NamedPipeServer {
|
|
26
|
-
constructor(kind, id) {
|
|
27
|
-
this.connecting = false;
|
|
28
|
-
this.containsFileCache = new Map();
|
|
29
|
-
this.componentNamesAndProps = new language_core_1.FileMap(false);
|
|
30
|
-
this.seq = 0;
|
|
31
|
-
this.dataChunks = [];
|
|
32
|
-
this.requestHandlers = new Map();
|
|
33
|
-
this.path = getServerPath(kind, id);
|
|
34
|
-
}
|
|
35
|
-
containsFile(fileName) {
|
|
36
|
-
if (this.projectInfo) {
|
|
37
|
-
if (!this.containsFileCache.has(fileName)) {
|
|
38
|
-
this.containsFileCache.set(fileName, (async () => {
|
|
39
|
-
const res = await this.sendRequest('containsFile', fileName);
|
|
40
|
-
if (typeof res !== 'boolean') {
|
|
41
|
-
// If the request fails, delete the cache
|
|
42
|
-
this.containsFileCache.delete(fileName);
|
|
43
|
-
}
|
|
44
|
-
return res;
|
|
45
|
-
})());
|
|
46
|
-
}
|
|
47
|
-
return this.containsFileCache.get(fileName);
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
async getComponentProps(fileName, tag) {
|
|
51
|
-
const componentAndProps = this.componentNamesAndProps.get(fileName);
|
|
52
|
-
if (!componentAndProps) {
|
|
53
|
-
return;
|
|
54
|
-
}
|
|
55
|
-
const props = componentAndProps[tag]
|
|
56
|
-
?? componentAndProps[(0, shared_1.camelize)(tag)]
|
|
57
|
-
?? componentAndProps[(0, shared_1.capitalize)((0, shared_1.camelize)(tag))];
|
|
58
|
-
if (props) {
|
|
59
|
-
return props;
|
|
60
|
-
}
|
|
61
|
-
return await this.sendRequest('subscribeComponentProps', fileName, tag);
|
|
62
|
-
}
|
|
63
|
-
update() {
|
|
64
|
-
if (!this.connecting && !this.projectInfo) {
|
|
65
|
-
this.connecting = true;
|
|
66
|
-
this.connect();
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
connect() {
|
|
70
|
-
this.socket = net.connect(this.path);
|
|
71
|
-
this.socket.on('data', this.onData.bind(this));
|
|
72
|
-
this.socket.on('connect', async () => {
|
|
73
|
-
const projectInfo = await this.sendRequest('projectInfo', '');
|
|
74
|
-
if (projectInfo) {
|
|
75
|
-
console.log('TSServer project ready:', projectInfo.name);
|
|
76
|
-
this.projectInfo = projectInfo;
|
|
77
|
-
this.containsFileCache.clear();
|
|
78
|
-
exports.onServerReady.forEach(cb => cb());
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
81
|
-
this.close();
|
|
82
|
-
}
|
|
83
|
-
});
|
|
84
|
-
this.socket.on('error', err => {
|
|
85
|
-
if (err.code === 'ECONNREFUSED') {
|
|
86
|
-
try {
|
|
87
|
-
console.log('Deleteing invalid named pipe file:', this.path);
|
|
88
|
-
fs.promises.unlink(this.path);
|
|
89
|
-
}
|
|
90
|
-
catch { }
|
|
91
|
-
}
|
|
92
|
-
this.close();
|
|
93
|
-
});
|
|
94
|
-
this.socket.on('timeout', () => {
|
|
95
|
-
this.close();
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
close() {
|
|
99
|
-
this.connecting = false;
|
|
100
|
-
this.projectInfo = undefined;
|
|
101
|
-
this.socket?.end();
|
|
102
|
-
}
|
|
103
|
-
onData(chunk) {
|
|
104
|
-
this.dataChunks.push(chunk);
|
|
105
|
-
const data = Buffer.concat(this.dataChunks);
|
|
106
|
-
const text = data.toString();
|
|
107
|
-
if (text.endsWith('\n\n')) {
|
|
108
|
-
this.dataChunks.length = 0;
|
|
109
|
-
const results = text.split('\n\n');
|
|
110
|
-
for (let result of results) {
|
|
111
|
-
result = result.trim();
|
|
112
|
-
if (!result) {
|
|
113
|
-
continue;
|
|
114
|
-
}
|
|
115
|
-
try {
|
|
116
|
-
const data = JSON.parse(result.trim());
|
|
117
|
-
if (typeof data[0] === 'number') {
|
|
118
|
-
const [seq, res] = data;
|
|
119
|
-
this.requestHandlers.get(seq)?.(res);
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
const [type, fileName, res] = data;
|
|
123
|
-
this.onNotification(type, fileName, res);
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
catch (e) {
|
|
127
|
-
console.error('JSON parse error:', e);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
onNotification(type, fileName, data) {
|
|
133
|
-
// console.log(`[${type}] ${fileName} ${JSON.stringify(data)}`);
|
|
134
|
-
if (type === 'componentNamesUpdated') {
|
|
135
|
-
let components = this.componentNamesAndProps.get(fileName);
|
|
136
|
-
if (!components) {
|
|
137
|
-
components = {};
|
|
138
|
-
this.componentNamesAndProps.set(fileName, components);
|
|
139
|
-
}
|
|
140
|
-
const newNames = data;
|
|
141
|
-
const newNameSet = new Set(newNames);
|
|
142
|
-
for (const name in components) {
|
|
143
|
-
if (!newNameSet.has(name)) {
|
|
144
|
-
delete components[name];
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
for (const name of newNames) {
|
|
148
|
-
if (!components[name]) {
|
|
149
|
-
components[name] = null;
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
else if (type === 'componentPropsUpdated') {
|
|
154
|
-
const components = this.componentNamesAndProps.get(fileName) ?? {};
|
|
155
|
-
const [name, props] = data;
|
|
156
|
-
if (name in components) {
|
|
157
|
-
components[name] = props;
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
console.error('Unknown notification type:', type);
|
|
162
|
-
debugger;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
sendRequest(requestType, fileName, ...args) {
|
|
166
|
-
return new Promise(resolve => {
|
|
167
|
-
const seq = this.seq++;
|
|
168
|
-
// console.time(`[${seq}] ${requestType} ${fileName}`);
|
|
169
|
-
this.requestHandlers.set(seq, data => {
|
|
170
|
-
// console.timeEnd(`[${seq}] ${requestType} ${fileName}`);
|
|
171
|
-
this.requestHandlers.delete(seq);
|
|
172
|
-
resolve(data);
|
|
173
|
-
clearInterval(retryTimer);
|
|
174
|
-
});
|
|
175
|
-
const retry = () => {
|
|
176
|
-
const data = [seq, requestType, fileName, ...args];
|
|
177
|
-
this.socket.write(JSON.stringify(data) + '\n\n');
|
|
178
|
-
};
|
|
179
|
-
retry();
|
|
180
|
-
const retryTimer = setInterval(retry, 1000);
|
|
181
|
-
});
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
exports.configuredServers = [];
|
|
185
|
-
exports.inferredServers = [];
|
|
186
|
-
exports.onServerReady = [];
|
|
187
|
-
for (let i = 0; i < 10; i++) {
|
|
188
|
-
exports.configuredServers.push(new NamedPipeServer(1, i));
|
|
189
|
-
exports.inferredServers.push(new NamedPipeServer(0, i));
|
|
190
|
-
}
|
|
191
|
-
async function getBestServer(fileName) {
|
|
192
|
-
for (const server of exports.configuredServers) {
|
|
193
|
-
server.update();
|
|
194
|
-
}
|
|
195
|
-
let servers = (await Promise.all(exports.configuredServers.map(async (server) => {
|
|
196
|
-
const projectInfo = server.projectInfo;
|
|
197
|
-
if (!projectInfo) {
|
|
198
|
-
return;
|
|
199
|
-
}
|
|
200
|
-
const containsFile = await server.containsFile(fileName);
|
|
201
|
-
if (!containsFile) {
|
|
202
|
-
return;
|
|
203
|
-
}
|
|
204
|
-
return server;
|
|
205
|
-
}))).filter(server => !!server);
|
|
206
|
-
// Sort servers by tsconfig
|
|
207
|
-
servers.sort((a, b) => sortTSConfigs(fileName, a.projectInfo.name, b.projectInfo.name));
|
|
208
|
-
if (servers.length) {
|
|
209
|
-
// Return the first server
|
|
210
|
-
return servers[0];
|
|
211
|
-
}
|
|
212
|
-
for (const server of exports.inferredServers) {
|
|
213
|
-
server.update();
|
|
214
|
-
}
|
|
215
|
-
servers = (await Promise.all(exports.inferredServers.map(server => {
|
|
216
|
-
const projectInfo = server.projectInfo;
|
|
217
|
-
if (!projectInfo) {
|
|
218
|
-
return;
|
|
219
|
-
}
|
|
220
|
-
// Check if the file is in the project's directory
|
|
221
|
-
if (path.relative(projectInfo.currentDirectory, fileName).startsWith('..')) {
|
|
222
|
-
return;
|
|
223
|
-
}
|
|
224
|
-
return server;
|
|
225
|
-
}))).filter(server => !!server);
|
|
226
|
-
// Sort servers by directory
|
|
227
|
-
servers.sort((a, b) => b.projectInfo.currentDirectory.replace(/\\/g, '/').split('/').length
|
|
228
|
-
- a.projectInfo.currentDirectory.replace(/\\/g, '/').split('/').length);
|
|
229
|
-
if (servers.length) {
|
|
230
|
-
// Return the first server
|
|
231
|
-
return servers[0];
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
function sortTSConfigs(file, a, b) {
|
|
235
|
-
const inA = isFileInDir(file, path.dirname(a));
|
|
236
|
-
const inB = isFileInDir(file, path.dirname(b));
|
|
237
|
-
if (inA !== inB) {
|
|
238
|
-
const aWeight = inA ? 1 : 0;
|
|
239
|
-
const bWeight = inB ? 1 : 0;
|
|
240
|
-
return bWeight - aWeight;
|
|
241
|
-
}
|
|
242
|
-
const aLength = a.split('/').length;
|
|
243
|
-
const bLength = b.split('/').length;
|
|
244
|
-
return bLength - aLength;
|
|
245
|
-
}
|
|
246
|
-
function isFileInDir(fileName, dir) {
|
|
247
|
-
const relative = path.relative(dir, fileName);
|
|
248
|
-
return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
|
|
249
|
-
}
|
|
250
|
-
//# sourceMappingURL=utils.js.map
|