@volar/monaco 1.3.0-alpha.3-patch.2 → 1.4.0-alpha.1

package/out/worker.d.ts

@@ -20,7 +20,7 @@ declare class CdnDtsHost {
     constructor(cdn: string, versions?: Record<string, string>, onFetch?: ((fileName: string, text: string) => void) | undefined);
     getVersion(): Promise<number>;
     readFile(fileName: string): string | Promise<string | undefined> | undefined;
-    fetch(fileName: string): Promise<string | undefined>;
+    fetchFile(fileName: string): Promise<string | undefined>;
     resolveRequestFileName(fileName: string): string;
     /**
      * save / load with json

package/out/worker.js

@@ -1,23 +1,12 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDtsHost = exports.createLanguageService = void 0;
 const language_service_1 = require("@volar/language-service");
 const vscode_uri_1 = require("vscode-uri");
-const axios_1 = require("axios");
 function createLanguageService(options) {
-    var _a, _b, _c;
-    const dtsClient = options.dtsHost ? createDtsClient(options.dtsHost) : undefined;
+    const dtsFiles = new Map();
     const ts = options.typescript ? options.typescript.module : undefined;
-    const config = (_a = options.config) !== null && _a !== void 0 ? _a : {};
-    const compilerOptions = (_c = (_b = options.typescript) === null || _b === void 0 ? void 0 : _b.compilerOptions) !== null && _c !== void 0 ? _c : {};
+    const config = options.config ?? {};
+    const compilerOptions = options.typescript?.compilerOptions ?? {};
     let host = createLanguageServiceHost();
     let languageService = (0, language_service_1.createLanguageService)({
         host,
@@ -37,13 +26,13 @@ function createLanguageService(options) {
             InnocentRabbit.prototype[api] = () => languageService[api];
             continue;
         }
-        InnocentRabbit.prototype[api] = (...args) => __awaiter(this, void 0, void 0, function* () {
-            if (!dtsClient) {
+        InnocentRabbit.prototype[api] = async (...args) => {
+            if (!options.dtsHost) {
                 return languageService[api](...args);
             }
-            let oldVersion = yield dtsClient.getVersion();
-            let result = yield languageService[api](...args);
-            let newVersion = yield dtsClient.getVersion();
+            let oldVersion = await options.dtsHost.getVersion();
+            let result = await languageService[api](...args);
+            let newVersion = await options.dtsHost.getVersion();
             while (newVersion !== oldVersion) {
                 oldVersion = newVersion;
                 if (newVersion !== dtsVersion) {
@@ -57,17 +46,17 @@ function createLanguageService(options) {
                         fileNameToUri: (fileName) => vscode_uri_1.URI.file(fileName).toString(),
                     });
                 }
-                result = yield languageService[api](...args);
-                newVersion = yield dtsClient.getVersion();
+                result = await languageService[api](...args);
+                newVersion = await options.dtsHost.getVersion();
             }
             return result;
-        });
+        };
     }
     return new InnocentRabbit();
     function createLanguageServiceHost() {
         let projectVersion = 0;
         const modelSnapshot = new WeakMap();
-        const webFileSnapshot = new Map();
+        const dtsFileSnapshot = new Map();
         const modelVersions = new Map();
         const host = {
             getProjectVersion() {
@@ -93,16 +82,13 @@ function createLanguageService(options) {
                 if (model) {
                     return model.version.toString();
                 }
-                if (dtsClient) {
-                    const dts = dtsClient.readFile(fileName);
-                    if (dts) {
-                        return dts.length.toString();
-                    }
+                const dts = readDtsFile(fileName);
+                if (dts) {
+                    return dts.length.toString();
                 }
                 return '';
             },
             getScriptSnapshot(fileName) {
-                var _a;
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
                 if (model) {
                     const cache = modelSnapshot.get(model);
@@ -115,21 +101,19 @@ function createLanguageService(options) {
                             getLength: () => text.length,
                             getChangeRange: () => undefined,
                         }]);
-                    return (_a = modelSnapshot.get(model)) === null || _a === void 0 ? void 0 : _a[1];
+                    return modelSnapshot.get(model)?.[1];
                 }
-                if (webFileSnapshot.has(fileName)) {
-                    return webFileSnapshot.get(fileName);
+                if (dtsFileSnapshot.has(fileName)) {
+                    return dtsFileSnapshot.get(fileName);
                 }
-                if (dtsClient) {
-                    const webFileText = dtsClient.readFile(fileName);
-                    if (webFileText !== undefined) {
-                        webFileSnapshot.set(fileName, {
-                            getText: (start, end) => webFileText.substring(start, end),
-                            getLength: () => webFileText.length,
-                            getChangeRange: () => undefined,
-                        });
-                        return webFileSnapshot.get(fileName);
-                    }
+                const dtsFileText = readDtsFile(fileName);
+                if (dtsFileText !== undefined) {
+                    dtsFileSnapshot.set(fileName, {
+                        getText: (start, end) => dtsFileText.substring(start, end),
+                        getLength: () => dtsFileText.length,
+                        getChangeRange: () => undefined,
+                    });
+                    return dtsFileSnapshot.get(fileName);
                 }
             },
             getCompilationSettings() {
@@ -149,24 +133,30 @@ function createLanguageService(options) {
                 if (model) {
                     return model.getValue();
                 }
-                if (dtsClient) {
-                    return dtsClient.readFile(fileName);
-                }
+                return readDtsFile(fileName);
             },
             fileExists(fileName) {
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
                 if (model) {
                     return true;
                 }
-                if (dtsClient) {
-                    return dtsClient.readFile(fileName) !== undefined;
-                }
-                return false;
+                return readDtsFile(fileName) !== undefined;
             },
             getTypeScriptModule: ts ? (() => ts) : undefined,
         };
         return host;
     }
+    function readDtsFile(fileName) {
+        if (!dtsFiles.has(fileName) && options.dtsHost) {
+            dtsFiles.set(fileName, undefined);
+            readDtsFileAsync(fileName);
+        }
+        return dtsFiles.get(fileName);
+    }
+    async function readDtsFileAsync(fileName) {
+        const text = await options.dtsHost?.readFile(fileName);
+        dtsFiles.set(fileName, text);
+    }
 }
 exports.createLanguageService = createLanguageService;
 function createDtsHost(cdn, versions = {}, onFetch) {
@@ -181,14 +171,12 @@ class CdnDtsHost {
         this.files = new Map();
         this.lastUpdateFilesSize = 0;
     }
-    getVersion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this.files.size !== this.lastUpdateFilesSize) {
-                this.lastUpdateFilesSize = this.files.size;
-                yield Promise.all(this.files.values());
-            }
-            return this.files.size;
-        });
+    async getVersion() {
+        while (this.files.size !== this.lastUpdateFilesSize) {
+            this.lastUpdateFilesSize = this.files.size;
+            await Promise.all(this.files.values());
+        }
+        return this.files.size;
     }
     readFile(fileName) {
         if (fileName.startsWith('/node_modules/')
@@ -196,31 +184,23 @@ class CdnDtsHost {
             && (fileName.endsWith('.d.ts') || fileName.endsWith('/package.json'))) {
             if (!this.files.has(fileName)) {
                 this.files.set(fileName, undefined);
-                this.files.set(fileName, this.fetch(fileName));
+                this.files.set(fileName, this.fetchFile(fileName));
             }
             return this.files.get(fileName);
         }
         return undefined;
     }
-    fetch(fileName) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestFileName = this.resolveRequestFileName(fileName);
-            const url = this.cdn + requestFileName.slice('/node_modules/'.length);
-            try {
-                const text = (_a = (yield axios_1.default.get(url, {
-                    transformResponse: (res) => {
-                        // avoid parse to json object
-                        return res;
-                    },
-                })).data) !== null && _a !== void 0 ? _a : undefined;
-                (_b = this.onFetch) === null || _b === void 0 ? void 0 : _b.call(this, fileName, text);
-                return text;
-            }
-            catch (_c) {
-                // ignore
-            }
-        });
+    async fetchFile(fileName) {
+        const requestFileName = this.resolveRequestFileName(fileName);
+        const url = this.cdn + requestFileName.slice('/node_modules/'.length);
+        try {
+            const text = await (await fetch(url)).text();
+            this.onFetch?.(fileName, text);
+            return text;
+        }
+        catch {
+            // ignore
+        }
     }
     resolveRequestFileName(fileName) {
         for (const [key, version] of Object.entries(this.versions)) {
@@ -234,42 +214,17 @@ class CdnDtsHost {
     /**
      * save / load with json
      */
-    toJson() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const json = {};
-            for (const [fileName, file] of this.files) {
-                json[fileName] = (_a = (yield file)) !== null && _a !== void 0 ? _a : null;
-            }
-            return json;
-        });
+    async toJson() {
+        const json = {};
+        for (const [fileName, file] of this.files) {
+            json[fileName] = (await file) ?? null;
+        }
+        return json;
     }
     fromJson(json) {
         for (const [fileName, file] of Object.entries(json)) {
-            this.files.set(fileName, file !== null && file !== void 0 ? file : undefined);
+            this.files.set(fileName, file ?? undefined);
         }
     }
 }
-function createDtsClient(server) {
-    const fetchTasks = [];
-    const files = new Map();
-    return {
-        readFile,
-        getVersion: () => server.getVersion(),
-        readFileAsync,
-    };
-    function readFile(fileName) {
-        if (!files.has(fileName)) {
-            files.set(fileName, undefined);
-            fetchTasks.push([fileName, readFileAsync(fileName)]);
-        }
-        return files.get(fileName);
-    }
-    function readFileAsync(fileName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const text = yield server.readFile(fileName);
-            files.set(fileName, text);
-        });
-    }
-}
 //# sourceMappingURL=worker.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.3.0-alpha.3-patch.2",
+	"version": "1.4.0-alpha.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,10 +15,10 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.3.0-alpha.3",
-		"axios": "^1.3.4",
+		"@volar/language-service": "1.4.0-alpha.1",
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
-	}
+	},
+	"gitHead": "41ea915b137aea284e2bf5edd98a788ce21b779c"
 }