@volar/monaco 1.6.8 → 1.6.9

package/out/editor.js

@@ -38,7 +38,7 @@ var editor;
             let timer;
             const changeSubscription = model.onDidChangeContent(() => {
                 clearTimeout(timer);
-                timer = setTimeout(() => doValidation(model), 200);
+                timer = setTimeout(() => doValidation(model), 250);
             });
             const visibleSubscription = model.onDidChangeAttached(() => {
                 if (model.isAttachedToEditor()) {

package/out/worker.d.ts

@@ -1,33 +1,14 @@
 import { type Config } from '@volar/language-service';
 import type * as monaco from 'monaco-editor-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
+import * as webFs from '@volar/web-fs';
+export * from '@volar/web-fs';
 export declare function createLanguageService(options: {
     workerContext: monaco.worker.IWorkerContext<any>;
-    dtsHost?: DtsHost;
+    dtsHost?: webFs.IDtsHost;
     config: Config;
     typescript?: {
         module: typeof import('typescript/lib/tsserverlibrary');
         compilerOptions: ts.CompilerOptions;
     };
 }): {};
-export declare function createBaseDtsHost(cdn: string, versions?: Record<string, string>, flat?: (pkg: string, version: string | undefined) => Promise<string[]>, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
-export declare function createJsDelivrDtsHost(versions?: Record<string, string>, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
-export interface DtsHost {
-    readFile(fileName: string): Thenable<string | undefined>;
-    getVersion(): Thenable<number>;
-}
-declare class CdnDtsHost implements DtsHost {
-    private cdn;
-    private versions;
-    private flat?;
-    private onFetch?;
-    files: Map<string, Promise<string | undefined>>;
-    flatResult: Map<string, Promise<string[]>>;
-    lastUpdateFilesSize: number;
-    constructor(cdn: string, versions?: Record<string, string>, flat?: ((pkg: string, version: string | undefined) => Promise<string[]>) | undefined, onFetch?: ((fileName: string, text: string) => void) | undefined);
-    getVersion(): Promise<number>;
-    readFile(fileName: string): Promise<string | undefined>;
-    fetchFile(fileName: string): Promise<string | undefined>;
-    resolveRequestFileName(fileName: string): string;
-}
-export {};

package/out/worker.js

@@ -1,28 +1,44 @@
 "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.createJsDelivrDtsHost = exports.createBaseDtsHost = exports.createLanguageService = void 0;
+exports.createLanguageService = void 0;
 const language_service_1 = require("@volar/language-service");
 const vscode_uri_1 = require("vscode-uri");
+const webFs = require("@volar/web-fs");
+__exportStar(require("@volar/web-fs"), exports);
 function createLanguageService(options) {
+    let dtsClientVersion = 0;
     const ts = options.typescript?.module;
-    const dtsFiles = new Map();
     const config = options.config ?? {};
     const compilerOptions = options.typescript?.compilerOptions ?? {};
-    let host = createLanguageServiceHost();
-    let languageService = (0, language_service_1.createLanguageService)({ typescript: ts }, {
+    const host = createLanguageServiceHost();
+    const languageService = (0, language_service_1.createLanguageService)({ typescript: ts }, {
         uriToFileName: uri => vscode_uri_1.URI.parse(uri).fsPath.replace(/\\/g, '/'),
         fileNameToUri: fileName => vscode_uri_1.URI.file(fileName).toString(),
         rootUri: vscode_uri_1.URI.file('/'),
     }, config, host);
-    let dtsVersion = 0;
-    let runningApis = 0;
-    const toClear = new Set();
+    const dtsClient = options.dtsHost ? webFs.createDtsClient(options.dtsHost) : undefined;
+    if (!dtsClient) {
+        return languageService;
+    }
     class InnocentRabbit {
     }
     ;
     for (const api in languageService) {
         const isFunction = typeof languageService[api] === 'function';
-        ;
         if (!isFunction) {
             InnocentRabbit.prototype[api] = () => languageService[api];
             continue;
@@ -31,35 +47,13 @@ function createLanguageService(options) {
             if (!options.dtsHost) {
                 return languageService[api](...args);
             }
-            let result;
-            try {
-                runningApis++;
-                let oldVersion = await options.dtsHost.getVersion();
+            let lastDtsClientVersion = dtsClientVersion;
+            let result = await languageService[api](...args);
+            dtsClientVersion = await dtsClient.sync();
+            while (lastDtsClientVersion !== dtsClientVersion) {
+                lastDtsClientVersion = dtsClientVersion;
                 result = await languageService[api](...args);
-                let newVersion = await options.dtsHost.getVersion();
-                while (newVersion !== oldVersion) {
-                    oldVersion = newVersion;
-                    if (newVersion !== dtsVersion) {
-                        dtsVersion = newVersion;
-                        toClear.add(languageService);
-                        languageService = (0, language_service_1.createLanguageService)({ typescript: ts }, {
-                            rootUri: vscode_uri_1.URI.file('/'),
-                            uriToFileName: (uri) => vscode_uri_1.URI.parse(uri).fsPath.replace(/\\/g, '/'),
-                            fileNameToUri: (fileName) => vscode_uri_1.URI.file(fileName).toString(),
-                        }, config, host);
-                    }
-                    result = await languageService[api](...args);
-                    newVersion = await options.dtsHost.getVersion();
-                }
-            }
-            finally {
-                runningApis--;
-            }
-            if (runningApis === 0 && toClear.size > 0) {
-                for (const languageService of toClear) {
-                    languageService.dispose();
-                }
-                toClear.clear();
+                dtsClientVersion = await dtsClient.sync();
             }
             return result;
         };
@@ -75,7 +69,7 @@ function createLanguageService(options) {
                 const models = options.workerContext.getMirrorModels();
                 if (modelVersions.size === options.workerContext.getMirrorModels().length) {
                     if (models.every(model => modelVersions.get(model) === model.version)) {
-                        return projectVersion.toString();
+                        return dtsClientVersion.toString() + ':' + projectVersion.toString();
                     }
                 }
                 modelVersions.clear();
@@ -83,7 +77,10 @@ function createLanguageService(options) {
                     modelVersions.set(model, model.version);
                 }
                 projectVersion++;
-                return projectVersion.toString();
+                return dtsClientVersion.toString() + ':' + projectVersion.toString();
+            },
+            getTypeRootsVersion() {
+                return dtsClientVersion;
             },
             getScriptFileNames() {
                 const models = options.workerContext.getMirrorModels();
@@ -94,11 +91,7 @@ function createLanguageService(options) {
                 if (model) {
                     return model.version.toString();
                 }
-                const dts = readDtsFile(fileName);
-                if (dts) {
-                    return dts.length.toString();
-                }
-                return '';
+                return dtsClient?.readFile(fileName)?.length.toString() ?? '';
             },
             getScriptSnapshot(fileName) {
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
@@ -118,7 +111,7 @@ function createLanguageService(options) {
                 if (dtsFileSnapshot.has(fileName)) {
                     return dtsFileSnapshot.get(fileName);
                 }
-                const dtsFileText = readDtsFile(fileName);
+                const dtsFileText = dtsClient?.readFile(fileName);
                 if (dtsFileText !== undefined) {
                     dtsFileSnapshot.set(fileName, {
                         getText: (start, end) => dtsFileText.substring(start, end),
@@ -145,165 +138,18 @@ function createLanguageService(options) {
                 if (model) {
                     return model.getValue();
                 }
-                return readDtsFile(fileName);
+                return dtsClient?.readFile(fileName);
             },
             fileExists(fileName) {
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
                 if (model) {
                     return true;
                 }
-                return readDtsFile(fileName) !== undefined;
+                return dtsClient?.fileExists(fileName) ?? false;
             },
         };
         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 createBaseDtsHost(cdn, versions = {}, flat, onFetch) {
-    return new CdnDtsHost(cdn, versions, flat, onFetch);
-}
-exports.createBaseDtsHost = createBaseDtsHost;
-function createJsDelivrDtsHost(versions = {}, onFetch) {
-    return new CdnDtsHost('https://cdn.jsdelivr.net/npm/', versions, async (pkg, version) => {
-        if (!version) {
-            const data = await fetchJson(`https://data.jsdelivr.com/v1/package/resolve/npm/${pkg}@latest`);
-            if (data?.version) {
-                version = data.version;
-            }
-        }
-        if (!version) {
-            return [];
-        }
-        const flat = await fetchJson(`https://data.jsdelivr.com/v1/package/npm/${pkg}@${version}/flat`);
-        if (!flat) {
-            return [];
-        }
-        return flat.files.map(file => file.name);
-    }, onFetch);
-}
-exports.createJsDelivrDtsHost = createJsDelivrDtsHost;
-class CdnDtsHost {
-    constructor(cdn, versions = {}, flat, onFetch) {
-        this.cdn = cdn;
-        this.versions = versions;
-        this.flat = flat;
-        this.onFetch = onFetch;
-        this.files = new Map();
-        this.flatResult = new Map();
-        this.lastUpdateFilesSize = 0;
-    }
-    async getVersion() {
-        while (this.files.size !== this.lastUpdateFilesSize) {
-            const newFileSize = this.files.size;
-            await Promise.all(this.files.values());
-            if (newFileSize > this.lastUpdateFilesSize) {
-                this.lastUpdateFilesSize = newFileSize;
-            }
-        }
-        return this.files.size;
-    }
-    async readFile(fileName) {
-        if (fileName.startsWith('/node_modules/')
-            // ignore .js because it's no help for intellisense
-            && (fileName.endsWith('.d.ts') || fileName.endsWith('/package.json'))) {
-            if (!this.files.has(fileName)) {
-                this.files.set(fileName, this.fetchFile(fileName));
-            }
-            return await this.files.get(fileName);
-        }
-        return undefined;
-    }
-    async fetchFile(fileName) {
-        if (this.flat) {
-            let pkgName = fileName.split('/')[2];
-            if (pkgName.startsWith('@')) {
-                pkgName += '/' + fileName.split('/')[3];
-            }
-            if (pkgName.endsWith('.d.ts') || pkgName.endsWith('/node_modules')) {
-                return undefined;
-            }
-            // hard code for known invalid package
-            if (pkgName.startsWith('@typescript/') || pkgName.startsWith('@types/typescript__')) {
-                return undefined;
-            }
-            // don't check @types if original package already having types
-            if (pkgName.startsWith('@types/')) {
-                let originalPkgName = pkgName.slice('@types/'.length);
-                if (originalPkgName.indexOf('__') >= 0) {
-                    originalPkgName = '@' + originalPkgName.replace('__', '/');
-                }
-                const packageJson = await this.readFile(`/node_modules/${originalPkgName}/package.json`);
-                if (packageJson) {
-                    const packageJsonObj = JSON.parse(packageJson);
-                    if (packageJsonObj.types || packageJsonObj.typings) {
-                        return undefined;
-                    }
-                    const indexDts = await this.readFile(`/node_modules/${originalPkgName}/index.d.ts`);
-                    if (indexDts) {
-                        return undefined;
-                    }
-                }
-            }
-            if (!this.flatResult.has(pkgName)) {
-                this.flatResult.set(pkgName, this.flat(pkgName, this.versions[pkgName]));
-            }
-            const flat = await this.flatResult.get(pkgName);
-            const include = flat.includes(fileName.slice(`/node_modules/${pkgName}`.length));
-            if (!include) {
-                return undefined;
-            }
-        }
-        const requestFileName = this.resolveRequestFileName(fileName);
-        const url = this.cdn + requestFileName.slice('/node_modules/'.length);
-        const text = await fetchText(url);
-        if (text) {
-            if (this.onFetch) {
-                this.onFetch(fileName, text);
-            }
-        }
-        return text;
-    }
-    resolveRequestFileName(fileName) {
-        for (const [key, version] of Object.entries(this.versions)) {
-            if (fileName.startsWith(`/node_modules/${key}/`)) {
-                fileName = fileName.replace(`/node_modules/${key}/`, `/node_modules/${key}@${version}/`);
-                return fileName;
-            }
-        }
-        return fileName;
-    }
-}
-async function fetchText(url) {
-    try {
-        const res = await fetch(url);
-        if (res.status === 200) {
-            return await res.text();
-        }
-    }
-    catch {
-        // ignore
-    }
-}
-async function fetchJson(url) {
-    try {
-        const res = await fetch(url);
-        if (res.status === 200) {
-            return await res.json();
-        }
-    }
-    catch {
-        // ignore
-    }
-}
 //# sourceMappingURL=worker.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.6.8",
+	"version": "1.6.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,12 +15,13 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.6.8",
+		"@volar/language-service": "1.6.9",
 		"vscode-uri": "^3.0.7"
 	},
 	"devDependencies": {
+		"@volar/web-fs": "1.6.9",
 		"monaco-editor-core": "latest",
 		"vscode-languageserver-protocol": "^3.17.3"
 	},
-	"gitHead": "3d269c7e69850ac5497469bede13f057db8a4980"
+	"gitHead": "e676fa08e4186bd2f8cc14861ef65f8d8c855ea1"
 }