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

package/README.md

@@ -51,7 +51,7 @@ createLanguageService({
 		},
 	},
 	// Enable auto fetch node_modules types
-	dtsHost: createDtsHost('https://unpkg.com/'),
+	dtsHost: createDtsHost('https://unpkg.com/', { typescript: '4.9.5' }),
 });
 ```
 

package/out/worker.d.ts

@@ -10,15 +10,22 @@ export declare function createLanguageService(options: {
         compilerOptions: ts.CompilerOptions;
     };
 }): {};
-export declare function createDtsHost(cdn: string, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
+export declare function createDtsHost(cdn: string, versions?: Record<string, string>, onFetch?: (fileName: string, text: string) => void): CdnDtsHost;
 declare class CdnDtsHost {
-    private cdn;
-    private onFetch?;
+    cdn: string;
+    versions: Record<string, string>;
+    onFetch?: ((fileName: string, text: string) => void) | undefined;
     files: Map<string, string | Promise<string | undefined> | undefined>;
     lastUpdateFilesSize: number;
-    constructor(cdn: string, onFetch?: ((fileName: string, text: string) => void) | undefined);
+    constructor(cdn: string, versions?: Record<string, 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>;
+    readFile(fileName: string): string | Promise<string | undefined> | undefined;
+    fetch(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

@@ -169,13 +169,14 @@ function createLanguageService(options) {
     }
 }
 exports.createLanguageService = createLanguageService;
-function createDtsHost(cdn, onFetch) {
-    return new CdnDtsHost(cdn, onFetch);
+function createDtsHost(cdn, versions = {}, onFetch) {
+    return new CdnDtsHost(cdn, versions, onFetch);
 }
 exports.createDtsHost = createDtsHost;
 class CdnDtsHost {
-    constructor(cdn, onFetch) {
+    constructor(cdn, versions = {}, onFetch) {
         this.cdn = cdn;
+        this.versions = versions;
         this.onFetch = onFetch;
         this.files = new Map();
         this.lastUpdateFilesSize = 0;
@@ -190,20 +191,22 @@ class CdnDtsHost {
         });
     }
     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));
+        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.fetch(fileName));
             }
+            return this.files.get(fileName);
         }
-        return this.files.get(fileName);
+        return undefined;
     }
-    fetch(fileName, url) {
+    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) => {
@@ -219,6 +222,33 @@ class CdnDtsHost {
             }
         });
     }
+    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;
+    }
+    /**
+     * 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;
+        });
+    }
+    fromJson(json) {
+        for (const [fileName, file] of Object.entries(json)) {
+            this.files.set(fileName, file !== null && file !== void 0 ? file : undefined);
+        }
+    }
 }
 function createDtsClient(server) {
     const fetchTasks = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.3.0-alpha.3",
+	"version": "1.3.0-alpha.3-patch.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -20,6 +20,5 @@
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
-	},
-	"gitHead": "03c8fff84531d8740863da5f9350e0d9382b5784"
+	}
 }

package/out/dts.js

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