@volar/vscode 1.10.10-alpha.1 → 1.11.0

package/browser.d.ts

@@ -0,0 +1,2 @@
+export * from 'vscode-languageclient/browser';
+//# sourceMappingURL=browser.d.ts.map

package/browser.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("vscode-languageclient/browser"), exports);
+//# sourceMappingURL=browser.js.map

package/{out/index.d.ts → index.d.ts}

@@ -1,11 +1,12 @@
 import * as vscode from 'vscode';
-export { activate as activateAutoInsertion } from './features/autoInsertion';
-export { activate as activateWriteVirtualFiles } from './features/writeVirtualFiles';
-export { activate as activateFindFileReferences } from './features/fileReferences';
-export { activate as activateReloadProjects } from './features/reloadProject';
-export { activate as activateTsConfigStatusItem } from './features/tsconfig';
-export { activate as activateServerSys } from './features/serverSys';
-export { activate as activateTsVersionStatusItem, getTsdk } from './features/tsVersion';
+export { activate as activateAutoInsertion } from './lib/features/autoInsertion';
+export { activate as activateWriteVirtualFiles } from './lib/features/writeVirtualFiles';
+export { activate as activateFindFileReferences } from './lib/features/fileReferences';
+export { activate as activateReloadProjects } from './lib/features/reloadProject';
+export { activate as activateTsConfigStatusItem } from './lib/features/tsconfig';
+export { activate as activateServerSys } from './lib/features/serverSys';
+export { activate as activateTsVersionStatusItem, getTsdk } from './lib/features/tsVersion';
+export * from 'vscode-languageclient';
 export declare function takeOverModeActive(context: vscode.ExtensionContext): boolean;
 import type { BaseLanguageClient, Middleware } from 'vscode-languageclient';
 export declare const middleware: Middleware;

package/{out/index.js → index.js}

@@ -1,22 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportLabsVersion = exports.parseServerCommand = exports.middleware = exports.takeOverModeActive = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateServerSys = exports.activateTsConfigStatusItem = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateWriteVirtualFiles = exports.activateAutoInsertion = void 0;
 const vscode = require("vscode");
-var autoInsertion_1 = require("./features/autoInsertion");
+var autoInsertion_1 = require("./lib/features/autoInsertion");
 Object.defineProperty(exports, "activateAutoInsertion", { enumerable: true, get: function () { return autoInsertion_1.activate; } });
-var writeVirtualFiles_1 = require("./features/writeVirtualFiles");
+var writeVirtualFiles_1 = require("./lib/features/writeVirtualFiles");
 Object.defineProperty(exports, "activateWriteVirtualFiles", { enumerable: true, get: function () { return writeVirtualFiles_1.activate; } });
-var fileReferences_1 = require("./features/fileReferences");
+var fileReferences_1 = require("./lib/features/fileReferences");
 Object.defineProperty(exports, "activateFindFileReferences", { enumerable: true, get: function () { return fileReferences_1.activate; } });
-var reloadProject_1 = require("./features/reloadProject");
+var reloadProject_1 = require("./lib/features/reloadProject");
 Object.defineProperty(exports, "activateReloadProjects", { enumerable: true, get: function () { return reloadProject_1.activate; } });
-var tsconfig_1 = require("./features/tsconfig");
+var tsconfig_1 = require("./lib/features/tsconfig");
 Object.defineProperty(exports, "activateTsConfigStatusItem", { enumerable: true, get: function () { return tsconfig_1.activate; } });
-var serverSys_1 = require("./features/serverSys");
+var serverSys_1 = require("./lib/features/serverSys");
 Object.defineProperty(exports, "activateServerSys", { enumerable: true, get: function () { return serverSys_1.activate; } });
-var tsVersion_1 = require("./features/tsVersion");
+var tsVersion_1 = require("./lib/features/tsVersion");
 Object.defineProperty(exports, "activateTsVersionStatusItem", { enumerable: true, get: function () { return tsVersion_1.activate; } });
 Object.defineProperty(exports, "getTsdk", { enumerable: true, get: function () { return tsVersion_1.getTsdk; } });
+__exportStar(require("vscode-languageclient"), exports);
 function takeOverModeActive(context) {
     if (vscode.workspace.getConfiguration('volar').get('takeOverMode.extension') === context.extension.id) {
         return !vscode.extensions.getExtension('vscode.typescript-language-features');

package/lib/features/serverSys.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.activate = void 0;
+const vscode = require("vscode");
+const protocol_1 = require("@volar/language-server/protocol");
+async function activate(client) {
+    const subscriptions = [];
+    const textDecoder = new TextDecoder();
+    const jobs = new Map();
+    const progressAssets = new Set();
+    let startProgress = false;
+    let totalJobs = 0;
+    addRequestHandlers();
+    subscriptions.push(client.onDidChangeState(() => {
+        if (client.state === 2) {
+            addRequestHandlers();
+        }
+    }));
+    return vscode.Disposable.from(...subscriptions);
+    // To avoid hitting the API hourly limit, we keep requests as low as possible.
+    function addRequestHandlers() {
+        subscriptions.push(client.onRequest(protocol_1.FsStatRequest.type, stat));
+        subscriptions.push(client.onRequest(protocol_1.FsReadFileRequest.type, uri => {
+            return withProgress(() => readFile(uri), uri);
+        }));
+        subscriptions.push(client.onRequest(protocol_1.FsReadDirectoryRequest.type, uri => {
+            return withProgress(() => readDirectory(uri), uri);
+        }));
+        async function withProgress(fn, asset) {
+            if (progressAssets.has(asset)) {
+                return await fn();
+            }
+            progressAssets.add(asset);
+            asset = vscode.Uri.parse(asset).path;
+            totalJobs++;
+            let job;
+            try {
+                job = fn();
+                jobs.set(job, asset);
+                if (!startProgress && jobs.size >= 2) {
+                    startProgress = true;
+                    vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, async (progress) => {
+                        progress.report({
+                            message: `Loading ${totalJobs} resources: ${asset}`
+                        });
+                        while (jobs.size) {
+                            for (const [_, asset] of jobs) {
+                                progress.report({
+                                    message: `Loading ${totalJobs} resources: ${asset}`,
+                                });
+                                await sleep(100);
+                                break;
+                            }
+                        }
+                        startProgress = false;
+                    });
+                }
+                return await job;
+            }
+            finally {
+                jobs.delete(job);
+            }
+        }
+        async function stat(uri) {
+            // return early
+            const dirUri = uri.substring(0, uri.lastIndexOf('/'));
+            const baseName = uri.substring(uri.lastIndexOf('/') + 1);
+            const entries = await readDirectory(dirUri);
+            if (!entries.some(entry => entry[0] === baseName)) {
+                return;
+            }
+            const uri2 = client.protocol2CodeConverter.asUri(uri);
+            return await _stat(uri2);
+        }
+        async function readFile(uri) {
+            // return early
+            const dirUri = uri.substring(0, uri.lastIndexOf('/'));
+            const baseName = uri.substring(uri.lastIndexOf('/') + 1);
+            const entries = await readDirectory(dirUri);
+            const uri2 = client.protocol2CodeConverter.asUri(uri);
+            if (!entries.some(entry => entry[0] === baseName && entry[1] === vscode.FileType.File)) {
+                return;
+            }
+            return await _readFile(uri2);
+        }
+        async function readDirectory(uri) {
+            const uri2 = client.protocol2CodeConverter.asUri(uri);
+            return await (await _readDirectory(uri2))
+                .filter(([name]) => !name.startsWith('.'));
+        }
+        async function _readFile(uri) {
+            try {
+                return textDecoder.decode(await vscode.workspace.fs.readFile(uri));
+            }
+            catch { }
+        }
+        async function _readDirectory(uri) {
+            try {
+                return await vscode.workspace.fs.readDirectory(uri);
+            }
+            catch {
+                return [];
+            }
+        }
+        async function _stat(uri) {
+            try {
+                return await vscode.workspace.fs.stat(uri);
+            }
+            catch { }
+        }
+    }
+}
+exports.activate = activate;
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+//# sourceMappingURL=serverSys.js.map

package/node.d.ts

@@ -0,0 +1,2 @@
+export * from 'vscode-languageclient/browser';
+//# sourceMappingURL=node.d.ts.map

package/node.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("vscode-languageclient/browser"), exports);
+//# sourceMappingURL=node.js.map

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "@volar/vscode",
-	"version": "1.10.10-alpha.1",
-	"main": "out/index.js",
+	"version": "1.11.0",
 	"license": "MIT",
 	"files": [
-		"out/**/*.js",
-		"out/**/*.d.ts"
+		"**/*.js",
+		"**/*.d.ts"
 	],
 	"repository": {
 		"type": "git",
@@ -13,23 +12,15 @@
 		"directory": "packages/vscode"
 	},
 	"dependencies": {
-		"@volar/language-server": "1.10.10-alpha.1",
+		"@volar/language-server": "1.11.0",
 		"path-browserify": "^1.0.1",
+		"vscode-languageclient": "^9.0.1",
 		"vscode-nls": "^5.2.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@types/vscode": "^1.82.0",
-		"vscode-languageclient": "^9.0.1"
+		"@types/vscode": "^1.82.0"
 	},
-	"peerDependencies": {
-		"vscode-languageclient": "^9.0.1"
-	},
-	"peerDependenciesMeta": {
-		"vscode-languageclient": {
-			"optional": true
-		}
-	},
-	"gitHead": "7bf9da2be16293e5dd5d7ac886d0193c00749ff2"
+	"gitHead": "e3f563cbbf4cc03c058f5df38df0498034e5feb5"
 }

package/out/features/serverSys.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.activate = void 0;
-const vscode = require("vscode");
-const protocol_1 = require("@volar/language-server/protocol");
-async function activate(client) {
-    const subscriptions = [];
-    const textDecoder = new TextDecoder();
-    addHandle();
-    subscriptions.push(client.onDidChangeState(() => {
-        if (client.state === 2) {
-            addHandle();
-        }
-    }));
-    return vscode.Disposable.from(...subscriptions);
-    function addHandle() {
-        subscriptions.push(client.onRequest(protocol_1.FsStatRequest.type, async (uri) => {
-            const uri2 = client.protocol2CodeConverter.asUri(uri);
-            try {
-                return await vscode.workspace.fs.stat(uri2);
-            }
-            catch (err) {
-                // ignore
-            }
-        }));
-        subscriptions.push(client.onRequest(protocol_1.FsReadFileRequest.type, async (uri) => {
-            const uri2 = client.protocol2CodeConverter.asUri(uri);
-            try {
-                const data = await vscode.workspace.fs.readFile(uri2);
-                const text = textDecoder.decode(data);
-                return text;
-            }
-            catch (err) {
-                // ignore
-            }
-        }));
-        subscriptions.push(client.onRequest(protocol_1.FsReadDirectoryRequest.type, async (uri) => {
-            try {
-                const uri2 = client.protocol2CodeConverter.asUri(uri);
-                let data = await vscode.workspace.fs.readDirectory(uri2);
-                data = data.filter(([name]) => !name.startsWith('.'));
-                return data;
-            }
-            catch {
-                return [];
-            }
-        }));
-    }
-}
-exports.activate = activate;
-//# sourceMappingURL=serverSys.js.map