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

package/out/utils/autoFetchTypes.js

@@ -43,7 +43,7 @@ function createAutoTypesFetchingHost(cdn) {
         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')) {
+            if (uri.endsWith('.d.ts') || uri.endsWith('/package.json')) {
                 try {
                     return (_a = (yield axios_1.default.get(uri, {
                         transformResponse: (res) => {

package/out/worker.js

@@ -17,13 +17,19 @@ function createLanguageService(options) {
     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 autoFetchTypesCdn = typeof ((_d = options.typescript) === null || _d === void 0 ? void 0 : _d.autoFetchTypes) === 'object'
+        && options.typescript.autoFetchTypes.cdn
+        ? options.typescript.autoFetchTypes.cdn
+        : 'https://unpkg.com/';
     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 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 webFilesNumOfLanguageService = (_f = autoTypeFetchHost === null || autoTypeFetchHost === void 0 ? void 0 : autoTypeFetchHost.files.size) !== null && _f !== void 0 ? _f : 0;
     const syncedFiles = new Set();
     class InnocentRabbit {
@@ -51,7 +57,13 @@ function createLanguageService(options) {
                 if (autoTypeFetchHost.files.size > webFilesNumOfLanguageService) {
                     webFilesNumOfLanguageService = autoTypeFetchHost.files.size;
                     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();
@@ -147,7 +159,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 '';
             },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "1.3.0-alpha.0",
+	"version": "1.3.0-alpha.1",
 	"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.1",
 		"axios": "^1.3.4",
 		"monaco-editor-core": "^0.36.0",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
 	},
-	"gitHead": "7582403cc521d33f642183a32da44fb1f64e65ef"
+	"gitHead": "2926dc4af31890e01f6218773e88578ddf0de658"
 }