@volar/monaco 1.6.9 → 1.7.0

package/README.md

@@ -36,23 +36,37 @@ self.onmessage = () => {
 };
 ```
 
-#### TypeScript Support
+#### Add TypeScript Support
 
-```ts
-import { createLanguageService, createDtsHost } from '@volar/monaco/worker';
-import * as ts from 'typescript';
-
-createLanguageService({
-	// ...
-	typescript: {
-		module: ts as any,
-		compilerOptions: {
-			// ...tsconfig options
-		},
-	},
-	// Enable auto fetch node_modules types
-	dtsHost: createDtsHost('https://unpkg.com/', { typescript: '4.9.5' }),
-});
+```diff
+import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker';
+import type * as monaco from 'monaco-editor-core';
+import { createLanguageService } from '@volar/monaco/worker';
++import * as ts from 'typescript';
++import createTypeScriptService, { createJsDelivrDtsHost } from 'volar-service-typescript';
+
+self.onmessage = () => {
+	worker.initialize((ctx: monaco.worker.IWorkerContext) => {
+		return createLanguageService({
+			workerContext: ctx,
+			config: {
+				// ...Language Service Config of my-lang language support
++				services: {
++					typescript: createTypeScriptService({
++						// Enable auto fetch node_modules types
++						dtsHost: createJsDelivrDtsHost({ typescript: '4.9.5' }),
++					})
++				},
+			},
++			typescript: {
++				module: ts as any,
++				compilerOptions: {
++					// ...tsconfig options
++				},
++			},
+		});
+	});
+};
 ```
 
 ### Add worker loader to global env

package/out/editor.js

@@ -163,5 +163,5 @@ var editor;
         }
     }
     editor_1.activateAutoInsertion = activateAutoInsertion;
-})(editor = exports.editor || (exports.editor = {}));
+})(editor || (exports.editor = editor = {}));
 //# sourceMappingURL=editor.js.map

package/out/languages.js

@@ -35,5 +35,5 @@ var languages;
         return { dispose: () => disposables.forEach((d) => d.dispose()) };
     }
     languages_1.registerProvides = registerProvides;
-})(languages = exports.languages || (exports.languages = {}));
+})(languages || (exports.languages = languages = {}));
 //# sourceMappingURL=languages.js.map

package/out/utils/provider.js

@@ -14,10 +14,10 @@ async function createLanguageFeaturesProvider(worker, getSyncUris) {
     const inlayHints = new WeakMap();
     const languageService = await worker.getProxy();
     return {
-        triggerCharacters: await languageService.triggerCharacters(),
-        autoFormatTriggerCharacters: await languageService.autoFormatTriggerCharacters(),
-        signatureHelpTriggerCharacters: await languageService.signatureHelpTriggerCharacters(),
-        signatureHelpRetriggerCharacters: await languageService.signatureHelpRetriggerCharacters(),
+        triggerCharacters: await languageService.getTriggerCharacters(),
+        autoFormatTriggerCharacters: await languageService.getAutoFormatTriggerCharacters(),
+        signatureHelpTriggerCharacters: await languageService.getSignatureHelpTriggerCharacters(),
+        signatureHelpRetriggerCharacters: await languageService.getSignatureHelpRetriggerCharacters(),
         getLegend() {
             return language_service_1.standardSemanticTokensLegend;
         },

package/out/worker.d.ts

@@ -1,11 +1,8 @@
 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?: webFs.IDtsHost;
     config: Config;
     typescript?: {
         module: typeof import('typescript/lib/tsserverlibrary');

package/out/worker.js

@@ -1,75 +1,37 @@
 "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.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 config = options.config ?? {};
-    const compilerOptions = options.typescript?.compilerOptions ?? {};
     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);
-    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;
+        if (isFunction) {
+            InnocentRabbit.prototype[api] = languageService[api];
         }
-        InnocentRabbit.prototype[api] = async (...args) => {
-            if (!options.dtsHost) {
-                return languageService[api](...args);
-            }
-            let lastDtsClientVersion = dtsClientVersion;
-            let result = await languageService[api](...args);
-            dtsClientVersion = await dtsClient.sync();
-            while (lastDtsClientVersion !== dtsClientVersion) {
-                lastDtsClientVersion = dtsClientVersion;
-                result = await languageService[api](...args);
-                dtsClientVersion = await dtsClient.sync();
-            }
-            return result;
-        };
     }
     return new InnocentRabbit();
     function createLanguageServiceHost() {
         let projectVersion = 0;
         const modelSnapshot = new WeakMap();
-        const dtsFileSnapshot = new Map();
         const modelVersions = new Map();
         const host = {
             getProjectVersion() {
                 const models = options.workerContext.getMirrorModels();
                 if (modelVersions.size === options.workerContext.getMirrorModels().length) {
                     if (models.every(model => modelVersions.get(model) === model.version)) {
-                        return dtsClientVersion.toString() + ':' + projectVersion.toString();
+                        return projectVersion;
                     }
                 }
                 modelVersions.clear();
@@ -77,10 +39,7 @@ function createLanguageService(options) {
                     modelVersions.set(model, model.version);
                 }
                 projectVersion++;
-                return dtsClientVersion.toString() + ':' + projectVersion.toString();
-            },
-            getTypeRootsVersion() {
-                return dtsClientVersion;
+                return projectVersion;
             },
             getScriptFileNames() {
                 const models = options.workerContext.getMirrorModels();
@@ -88,10 +47,7 @@ function createLanguageService(options) {
             },
             getScriptVersion(fileName) {
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
-                if (model) {
-                    return model.version.toString();
-                }
-                return dtsClient?.readFile(fileName)?.length.toString() ?? '';
+                return model?.version.toString();
             },
             getScriptSnapshot(fileName) {
                 const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
@@ -108,45 +64,13 @@ function createLanguageService(options) {
                         }]);
                     return modelSnapshot.get(model)?.[1];
                 }
-                if (dtsFileSnapshot.has(fileName)) {
-                    return dtsFileSnapshot.get(fileName);
-                }
-                const dtsFileText = dtsClient?.readFile(fileName);
-                if (dtsFileText !== undefined) {
-                    dtsFileSnapshot.set(fileName, {
-                        getText: (start, end) => dtsFileText.substring(start, end),
-                        getLength: () => dtsFileText.length,
-                        getChangeRange: () => undefined,
-                    });
-                    return dtsFileSnapshot.get(fileName);
-                }
             },
             getCompilationSettings() {
-                return compilerOptions;
+                return options.typescript?.compilerOptions ?? {};
             },
             getCurrentDirectory() {
                 return '/';
             },
-            getDefaultLibFileName(options) {
-                if (ts) {
-                    return `/node_modules/typescript/lib/${ts.getDefaultLibFileName(options)}`;
-                }
-                return '';
-            },
-            readFile(fileName) {
-                const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
-                if (model) {
-                    return model.getValue();
-                }
-                return dtsClient?.readFile(fileName);
-            },
-            fileExists(fileName) {
-                const model = options.workerContext.getMirrorModels().find(model => model.uri.fsPath === fileName);
-                if (model) {
-                    return true;
-                }
-                return dtsClient?.fileExists(fileName) ?? false;
-            },
         };
         return host;
     }

package/package.json

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