@volar/monaco 1.6.4 → 1.6.5

package/out/worker.d.ts

@@ -3,29 +3,31 @@ import type * as monaco from 'monaco-editor-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function createLanguageService(options: {
     workerContext: monaco.worker.IWorkerContext<any>;
-    dtsHost?: ReturnType<typeof createDtsHost>;
+    dtsHost?: DtsHost;
     config: Config;
     typescript?: {
         module: typeof import('typescript/lib/tsserverlibrary');
         compilerOptions: ts.CompilerOptions;
     };
 }): {};
-export declare function createDtsHost(cdn: string, versions?: Record<string, string>, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
-declare class CdnDtsHost {
+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 {
     cdn: string;
     versions: Record<string, string>;
+    flat?: ((pkg: string, version: string | undefined) => Promise<string[]>) | undefined;
     onFetch?: ((fileName: string, text: string) => void) | undefined;
-    files: Map<string, string | Promise<string | undefined> | undefined>;
+    files: Map<string, Promise<string | undefined>>;
+    flatResult: Map<string, Promise<string[]>>;
     lastUpdateFilesSize: number;
-    constructor(cdn: string, versions?: Record<string, string>, onFetch?: ((fileName: string, text: string) => void) | undefined);
+    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): string | Promise<string | undefined> | undefined;
+    readFile(fileName: string): Promise<string | undefined>;
     fetchFile(fileName: string): Promise<string | undefined>;
     resolveRequestFileName(fileName: string): string;
-    /**
-     * save / load with json
-     */
-    toJson(): Promise<Record<string, string | null>>;
-    fromJson(json: Record<string, string | null>): void;
 }
 export {};

package/out/worker.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDtsHost = exports.createLanguageService = void 0;
+exports.createJsDelivrDtsHost = exports.createBaseDtsHost = exports.createLanguageService = void 0;
 const language_service_1 = require("@volar/language-service");
 const vscode_uri_1 = require("vscode-uri");
 function createLanguageService(options) {
@@ -15,6 +15,8 @@ function createLanguageService(options) {
         rootUri: vscode_uri_1.URI.file('/'),
     }, config, host);
     let dtsVersion = 0;
+    let runningApis = 0;
+    const toClear = new Set();
     class InnocentRabbit {
     }
     ;
@@ -29,22 +31,35 @@ function createLanguageService(options) {
             if (!options.dtsHost) {
                 return languageService[api](...args);
             }
-            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) {
-                    dtsVersion = newVersion;
+            let result;
+            try {
+                runningApis++;
+                let oldVersion = await options.dtsHost.getVersion();
+                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();
-                    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();
+                toClear.clear();
             }
             return result;
         };
@@ -121,7 +136,7 @@ function createLanguageService(options) {
             },
             getDefaultLibFileName(options) {
                 if (ts) {
-                    return `/node_modules/typescript@${ts.version}/lib/${ts.getDefaultLibFileName(options)}`;
+                    return `/node_modules/typescript/lib/${ts.getDefaultLibFileName(options)}`;
                 }
                 return '';
             },
@@ -155,48 +170,103 @@ function createLanguageService(options) {
     }
 }
 exports.createLanguageService = createLanguageService;
-function createDtsHost(cdn, versions = {}, onFetch) {
-    return new CdnDtsHost(cdn, versions, onFetch);
+function createBaseDtsHost(cdn, versions = {}, flat, onFetch) {
+    return new CdnDtsHost(cdn, versions, flat, onFetch);
 }
-exports.createDtsHost = createDtsHost;
+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 = {}, onFetch) {
+    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) {
-            this.lastUpdateFilesSize = this.files.size;
+            const newFileSize = this.files.size;
             await Promise.all(this.files.values());
+            if (newFileSize > this.lastUpdateFilesSize) {
+                this.lastUpdateFilesSize = newFileSize;
+            }
         }
         return this.files.size;
     }
-    readFile(fileName) {
+    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, undefined);
                 this.files.set(fileName, this.fetchFile(fileName));
             }
-            return this.files.get(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 the 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);
-        try {
-            const text = await (await fetch(url)).text();
-            this.onFetch?.(fileName, text);
-            return text;
-        }
-        catch {
-            // ignore
-        }
+        return await fetchText(url);
     }
     resolveRequestFileName(fileName) {
         for (const [key, version] of Object.entries(this.versions)) {
@@ -207,20 +277,27 @@ class CdnDtsHost {
         }
         return fileName;
     }
-    /**
-     * save / load with json
-     */
-    async toJson() {
-        const json = {};
-        for (const [fileName, file] of this.files) {
-            json[fileName] = (await file) ?? null;
+}
+async function fetchText(url) {
+    try {
+        const res = await fetch(url);
+        if (res.status === 200) {
+            return await res.text();
         }
-        return json;
     }
-    fromJson(json) {
-        for (const [fileName, file] of Object.entries(json)) {
-            this.files.set(fileName, file ?? undefined);
+    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.4",
+	"version": "1.6.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,10 +15,10 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.6.4",
+		"@volar/language-service": "1.6.5",
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
 	},
-	"gitHead": "653d792a5b1498f5b063f6a81a500a1db27b1ca7"
+	"gitHead": "7fa98d2d3bf1fde8aabb39f62d8522bea0c23098"
 }