@volar/monaco 1.3.0-alpha.0 → 1.3.0-alpha.2

package/README.md

@@ -39,7 +39,7 @@ self.onmessage = () => {
 #### TypeScript Support
 
 ```ts
-import { createLanguageService } from '@volar/monaco/worker';
+import { createLanguageService, createDtsHost } from '@volar/monaco/worker';
 import * as ts from 'typescript';
 
 createLanguageService({
@@ -49,9 +49,9 @@ createLanguageService({
 		compilerOptions: {
 			// ...tsconfig options
 		},
-		// Enable auto fetch node_modules types
-		autoFetchTypes: true,
 	},
+	// Enable auto fetch node_modules types
+	dtsHost: createDtsHost('https://unpkg.com/'),
 });
 ```
 
@@ -75,7 +75,7 @@ import myWorker from './my-lang.worker?worker';
 
 ```ts
 import type { LanguageService } from '@volar/language-service';
-import { editor, languages } from 'monaco-editor-core';
+import { editor, languages, Uri } from 'monaco-editor-core';
 import * as VolarMonaco from '@volar/monaco';
 
 languages.register({ id: 'my-lang', extensions: ['.my-lang'] });
@@ -85,7 +85,14 @@ languages.onLanguage('my-lang', () => {
 		moduleId: 'vs/language/my-lang/myLangWorker',
 		label: 'my-lang',
 	});
-	VolarMonaco.editor.activateMarkers(worker, ['my-lang'], 'my-lang-markers-owner', editor);
+	VolarMonaco.editor.activateMarkers(
+		worker,
+		['my-lang'],
+		'my-lang-markers-owner',
+		// root files
+		() => [Uri.file('/Foo.my-lang'), Uri.file('/Bar.my-lang')],
+		editor
+	);
 	VolarMonaco.languages.registerProvides(worker, ['my-lang'], languages)
 });
 ```

package/out/dts.js

@@ -0,0 +1 @@
+//# sourceMappingURL=dts.js.map

package/out/editor.d.ts

@@ -1,5 +1,5 @@
 import type { LanguageService } from '@volar/language-service';
-import type { editor as _editor, IDisposable } from 'monaco-editor-core';
+import type { editor as _editor, IDisposable, Uri } from 'monaco-editor-core';
 export declare namespace editor {
-    function activateMarkers(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, editor: typeof import('monaco-editor-core').editor): IDisposable;
+    function activateMarkers(worker: _editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: typeof import('monaco-editor-core').editor): IDisposable;
 }

package/out/editor.js

@@ -13,7 +13,7 @@ const markers_1 = require("./utils/markers");
 const protocol2monaco = require("./utils/protocol2monaco");
 var editor;
 (function (editor_1) {
-    function activateMarkers(worker, languages, markersOwn, editor) {
+    function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
         const disposables = [];
         const listener = new Map();
         disposables.push(editor.onDidCreateModel((model) => hostingMarkers(model)), editor.onWillDisposeModel(stopHostingMarkers), editor.onDidChangeModelLanguage((event) => {
@@ -73,7 +73,7 @@ var editor;
                 if (!model.isAttachedToEditor()) {
                     return;
                 }
-                const languageService = yield getLanguageService(model.uri);
+                const languageService = yield worker.withSyncedResources(getSyncUris());
                 const diagnostics = yield languageService.doValidation(model.uri.toString());
                 const result = diagnostics.map(error => {
                     const marker = protocol2monaco.asMarkerData(error);
@@ -83,12 +83,6 @@ var editor;
                 editor.setModelMarkers(model, markersOwn, result);
             });
         }
-        function getLanguageService(...uris) {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield worker.withSyncedResources(uris);
-                return worker.getProxy();
-            });
-        }
     }
     editor_1.activateMarkers = activateMarkers;
 })(editor = exports.editor || (exports.editor = {}));

package/out/worker.d.ts

@@ -3,13 +3,22 @@ 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>;
     config: Config;
     typescript?: {
         module: typeof import('typescript/lib/tsserverlibrary');
         compilerOptions: ts.CompilerOptions;
-        autoFetchTypes?: boolean | {
-            onFetchTypesFiles?(files: Record<string, string>): void;
-            cdn?: string;
-        };
     };
 }): {};
+export declare function createDtsHost(cdn: string, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
+declare class CdnDtsHost {
+    private cdn;
+    private onFetch?;
+    files: Map<string, string | Promise<string | undefined> | undefined>;
+    lastUpdateFilesSize: number;
+    constructor(cdn: string, onFetch?: ((fileName: string, text: string) => void) | undefined);
+    getVersion(): Promise<number>;
+    readFile(fileName: string): string | Promise<string | undefined>;
+    fetch(fileName: string, url: string): Promise<string | undefined>;
+}
+export {};

package/out/worker.js

@@ -8,24 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguageService = void 0;
+exports.createDtsHost = exports.createLanguageService = void 0;
 const language_service_1 = require("@volar/language-service");
 const vscode_uri_1 = require("vscode-uri");
-const autoFetchTypes_1 = require("./utils/autoFetchTypes");
+const axios_1 = require("axios");
 function createLanguageService(options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
+    const dtsClient = options.dtsHost ? createDtsClient(options.dtsHost) : undefined;
     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 : {};
-    let autoFetchTypesCdn = 'https://unpkg.com/';
-    if (typeof ((_d = options.typescript) === null || _d === void 0 ? void 0 : _d.autoFetchTypes) === 'object' && options.typescript.autoFetchTypes.cdn) {
-        autoFetchTypesCdn = options.typescript.autoFetchTypes.cdn;
-    }
-    const autoTypeFetchHost = ((_e = options.typescript) === null || _e === void 0 ? void 0 : _e.autoFetchTypes) ? (0, autoFetchTypes_1.createAutoTypesFetchingHost)(autoFetchTypesCdn) : undefined;
     let host = createLanguageServiceHost();
-    let languageService = (0, language_service_1.createLanguageService)(host, config, { rootUri: vscode_uri_1.URI.file('/') });
-    let webFilesNumOfLanguageService = (_f = autoTypeFetchHost === null || autoTypeFetchHost === void 0 ? void 0 : autoTypeFetchHost.files.size) !== null && _f !== void 0 ? _f : 0;
-    const syncedFiles = new Set();
+    let languageService = (0, language_service_1.createLanguageService)({
+        host,
+        config,
+        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('/'),
+    });
+    let dtsVersion = 0;
     class InnocentRabbit {
     }
     ;
@@ -37,35 +38,27 @@ function createLanguageService(options) {
             continue;
         }
         InnocentRabbit.prototype[api] = (...args) => __awaiter(this, void 0, void 0, function* () {
-            var _g;
-            if (!autoTypeFetchHost) {
+            if (!dtsClient) {
                 return languageService[api](...args);
             }
-            let shouldSync = false;
-            let webFilesNumOfThisCall = autoTypeFetchHost.files.size;
+            let oldVersion = yield dtsClient.getVersion();
             let result = yield languageService[api](...args);
-            yield autoTypeFetchHost.wait();
-            while (autoTypeFetchHost.files.size > webFilesNumOfThisCall) {
-                shouldSync = true;
-                webFilesNumOfThisCall = autoTypeFetchHost.files.size;
-                if (autoTypeFetchHost.files.size > webFilesNumOfLanguageService) {
-                    webFilesNumOfLanguageService = autoTypeFetchHost.files.size;
+            let newVersion = yield dtsClient.getVersion();
+            while (newVersion !== oldVersion) {
+                oldVersion = newVersion;
+                if (newVersion !== dtsVersion) {
+                    dtsVersion = newVersion;
                     languageService.dispose();
-                    languageService = (0, language_service_1.createLanguageService)(host, config, { rootUri: vscode_uri_1.URI.file('/') });
+                    languageService = (0, language_service_1.createLanguageService)({
+                        host,
+                        config,
+                        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(),
+                    });
                 }
                 result = yield languageService[api](...args);
-                yield autoTypeFetchHost.wait();
-            }
-            if (shouldSync && typeof ((_g = options.typescript) === null || _g === void 0 ? void 0 : _g.autoFetchTypes) === 'object' && options.typescript.autoFetchTypes.onFetchTypesFiles) {
-                const files = autoTypeFetchHost.files;
-                const syncFiles = {};
-                for (const [fileName, text] of files) {
-                    if (!syncedFiles.has(fileName) && text !== undefined) {
-                        syncFiles[fileName] = text;
-                        syncedFiles.add(fileName);
-                    }
-                }
-                options.typescript.autoFetchTypes.onFetchTypesFiles(syncFiles);
+                newVersion = yield dtsClient.getVersion();
             }
             return result;
         });
@@ -100,8 +93,8 @@ function createLanguageService(options) {
                 if (model) {
                     return model.version.toString();
                 }
-                if (autoTypeFetchHost) {
-                    const dts = autoTypeFetchHost.readFile(fileName);
+                if (dtsClient) {
+                    const dts = dtsClient.readFile(fileName);
                     if (dts) {
                         return dts.length.toString();
                     }
@@ -127,8 +120,8 @@ function createLanguageService(options) {
                 if (webFileSnapshot.has(fileName)) {
                     return webFileSnapshot.get(fileName);
                 }
-                if (autoTypeFetchHost) {
-                    const webFileText = autoTypeFetchHost.readFile(fileName);
+                if (dtsClient) {
+                    const webFileText = dtsClient.readFile(fileName);
                     if (webFileText !== undefined) {
                         webFileSnapshot.set(fileName, {
                             getText: (start, end) => webFileText.substring(start, end),
@@ -147,7 +140,7 @@ function createLanguageService(options) {
             },
             getDefaultLibFileName(options) {
                 if (ts) {
-                    return '/node_modules/typescript/lib/' + ts.getDefaultLibFileName(options);
+                    return `/node_modules/typescript@${ts.version}/lib/${ts.getDefaultLibFileName(options)}`;
                 }
                 return '';
             },
@@ -156,8 +149,8 @@ function createLanguageService(options) {
                 if (model) {
                     return model.getValue();
                 }
-                if (autoTypeFetchHost) {
-                    return autoTypeFetchHost.readFile(fileName);
+                if (dtsClient) {
+                    return dtsClient.readFile(fileName);
                 }
             },
             fileExists(fileName) {
@@ -165,8 +158,8 @@ function createLanguageService(options) {
                 if (model) {
                     return true;
                 }
-                if (autoTypeFetchHost) {
-                    return autoTypeFetchHost.fileExists(fileName);
+                if (dtsClient) {
+                    return dtsClient.readFile(fileName) !== undefined;
                 }
                 return false;
             },
@@ -176,4 +169,77 @@ function createLanguageService(options) {
     }
 }
 exports.createLanguageService = createLanguageService;
+function createDtsHost(cdn, onFetch) {
+    return new CdnDtsHost(cdn, onFetch);
+}
+exports.createDtsHost = createDtsHost;
+class CdnDtsHost {
+    constructor(cdn, onFetch) {
+        this.cdn = cdn;
+        this.onFetch = onFetch;
+        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;
+        });
+    }
+    readFile(fileName) {
+        if (!this.files.has(fileName)) {
+            this.files.set(fileName, undefined);
+            if (fileName.startsWith('/node_modules/')
+                // ignore .js because it's no help for intellisense
+                && (fileName.endsWith('.d.ts') || fileName.endsWith('/package.json'))) {
+                const url = this.cdn + fileName.slice('/node_modules/'.length);
+                this.files.set(fileName, this.fetch(fileName, url));
+            }
+        }
+        return this.files.get(fileName);
+    }
+    fetch(fileName, url) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            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
+            }
+        });
+    }
+}
+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.0",
+	"version": "1.3.0-alpha.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -15,11 +15,11 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "1.3.0-alpha.0",
+		"@volar/language-service": "1.3.0-alpha.2",
 		"axios": "^1.3.4",
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
 	},
-	"gitHead": "7582403cc521d33f642183a32da44fb1f64e65ef"
+	"gitHead": "84111017f289c36dfe4541159cad8a7e13c2be41"
 }

package/out/utils/autoFetchTypes.d.ts

@@ -1,6 +0,0 @@
-export declare function createAutoTypesFetchingHost(cdn: string): {
-    fileExists: (fileName: string) => boolean;
-    readFile: (fileName: string) => string | undefined;
-    files: Map<string, string | undefined>;
-    wait: () => Promise<void | undefined>;
-};

package/out/utils/autoFetchTypes.js

@@ -1,82 +0,0 @@
-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.createAutoTypesFetchingHost = void 0;
-const axios_1 = require("axios");
-function createAutoTypesFetchingHost(cdn) {
-    const fetchTasks = [];
-    const files = new Map();
-    let fetching;
-    return {
-        fileExists,
-        readFile,
-        files,
-        wait: () => __awaiter(this, void 0, void 0, function* () { return yield fetching; }),
-    };
-    function fileExists(fileName) {
-        return readFile(fileName) !== undefined;
-    }
-    function readFile(fileName) {
-        if (!files.has(fileName)) {
-            files.set(fileName, undefined);
-            fetch(fileName);
-        }
-        return files.get(fileName);
-    }
-    function readFileAsync(fileName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (fileName.startsWith('/node_modules/')) {
-                const url = cdn + fileName.slice('/node_modules/'.length);
-                const text = yield readWebFile(url);
-                files.set(fileName, text);
-            }
-        });
-    }
-    function readWebFile(uri) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // ignore .js because it's no help for intellisense
-            if (uri.endsWith('.d.ts') || uri.endsWith('.json')) {
-                try {
-                    return (_a = (yield axios_1.default.get(uri, {
-                        transformResponse: (res) => {
-                            // avoid parse to json object
-                            return res;
-                        },
-                    })).data) !== null && _a !== void 0 ? _a : undefined;
-                }
-                catch (_b) {
-                    // ignore
-                }
-            }
-        });
-    }
-    function fetch(fileName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            fetchTasks.push([fileName, readFileAsync(fileName)]);
-            if (!fetching) {
-                fetching = fetchWorker();
-                yield fetching;
-                fetching = undefined;
-            }
-        });
-    }
-    function fetchWorker() {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (fetchTasks.length) {
-                const tasks = fetchTasks.map(([_, task]) => task);
-                fetchTasks.length = 0;
-                yield Promise.all(tasks);
-            }
-        });
-    }
-}
-exports.createAutoTypesFetchingHost = createAutoTypesFetchingHost;
-//# sourceMappingURL=autoFetchTypes.js.map