@webgal/language-service 0.0.2-alpha.2 → 0.0.2-alpha.4

package/build/monaco/index.mjs

@@ -1,3 +1,196 @@
-import { n as createWebgalMonacoLanguageClient, r as createWebgalMonacoLanguageClientWithWorker, t as initWebgalMonaco } from "../monaco-init-D6m312d3.mjs";
+import { i as createVirtualFileSystem, n as registerWebgalClientHandlers, r as createMemoryVolarFileSystem, t as createWebgalClientHandlers } from "../client-handlers-CrU8stw6.mjs";
+import { webgalConfigGrammar, webgalGrammar, webgalLanguageConfiguration } from "../syntaxes.mjs";
+import { webgalDarkTheme, webgalWhiteTheme } from "../themes.mjs";
+import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from "vscode-ws-jsonrpc";
+import { BrowserMessageReader, BrowserMessageWriter, CloseAction, ErrorAction } from "vscode-languageclient/browser.js";
+import { MonacoLanguageClient } from "monaco-languageclient";
+import { initialize } from "@codingame/monaco-vscode-api";
+import { ExtensionHostKind, registerExtension } from "@codingame/monaco-vscode-api/extensions";
+import getLanguagesServiceOverride from "@codingame/monaco-vscode-languages-service-override";
+import getThemeServiceOverride from "@codingame/monaco-vscode-theme-service-override";
+import getTextMateServiceOverride from "@codingame/monaco-vscode-textmate-service-override";
+import "vscode/localExtensionHost";
 
-export { createWebgalMonacoLanguageClient, createWebgalMonacoLanguageClientWithWorker, initWebgalMonaco };
+//#region src/monaco/monaco.ts
+function createMemoryFileSystem(options) {
+	return createVirtualFileSystem(createMemoryVolarFileSystem(options));
+}
+const createWebgalMonacoLanguageClient = (options) => {
+	const { languageServerUrl, editor } = options;
+	const editorInstance = editor;
+	const vfs = options.virtualFileSystem || createMemoryFileSystem({ root: "file:///game" });
+	if (!options.virtualFileSystem) {
+		vfs.writeFile("file:///game/scene/start.txt", "WebGal:Start;");
+		vfs.writeFile("file:///game/config.txt", "");
+	}
+	const webSocket = new WebSocket(languageServerUrl);
+	webSocket.onopen = () => {
+		const socket = toSocket(webSocket);
+		const reader = new WebSocketMessageReader(socket);
+		const languageClient = createLanguageClient({
+			reader,
+			writer: new WebSocketMessageWriter(socket)
+		}, {
+			editor: editorInstance,
+			vfs
+		});
+		languageClient.start();
+		reader.onClose(() => languageClient.stop());
+	};
+	return {
+		webSocket,
+		vfs
+	};
+};
+const createWebgalMonacoLanguageClientWithWorker = (options) => {
+	const { worker, editor } = options;
+	const editorInstance = editor;
+	const vfs = options.virtualFileSystem || createMemoryFileSystem({ root: "file:///game" });
+	if (!options.virtualFileSystem) {
+		vfs.writeFile("file:///game/scene/start.txt", "WebGal:Start;");
+		vfs.writeFile("file:///game/config.txt", "");
+	}
+	const languageClient = createLanguageClient({
+		reader: new BrowserMessageReader(worker),
+		writer: new BrowserMessageWriter(worker)
+	}, {
+		editor: editorInstance,
+		vfs
+	});
+	languageClient.start();
+	worker.onerror = () => languageClient.stop();
+	worker.onmessageerror = () => languageClient.stop();
+	return {
+		worker,
+		vfs
+	};
+};
+const createLanguageClient = (messageTransports, options) => {
+	const handlers = createWebgalClientHandlers({
+		vfs: options.vfs,
+		overrides: {
+			"client/showTip": function(message) {
+				console.log(message);
+			},
+			"workspace/documentLink/refresh": () => {
+				const model = options.editor.getModel();
+				if (!model) return null;
+				options.editor.setModel(model);
+				return null;
+			}
+		}
+	});
+	const client = new MonacoLanguageClient({
+		name: "WebGAL Language Client",
+		clientOptions: {
+			documentSelector: [
+				{
+					scheme: "file",
+					language: "webgal"
+				},
+				{
+					scheme: "file",
+					language: "webgal-config"
+				},
+				{
+					scheme: "inmemory",
+					language: "webgal"
+				},
+				{
+					scheme: "inmemory",
+					language: "webgal-config"
+				}
+			],
+			errorHandler: {
+				error: () => ({ action: ErrorAction.Continue }),
+				closed: () => ({ action: CloseAction.DoNotRestart })
+			},
+			synchronize: { configurationSection: ["webgal", "http"] },
+			initializationOptions() {
+				const model = options.editor.getModel();
+				return {
+					processId: Math.random(),
+					rootPath: "file:///game",
+					rootUri: "file:///game",
+					capabilities: {},
+					workspaceFolders: [{
+						uri: "file:///game",
+						name: "example"
+					}],
+					...model ? { textDocument: { uri: model.uri.toString() } } : {}
+				};
+			}
+		},
+		messageTransports
+	});
+	registerWebgalClientHandlers(client, handlers);
+	options.vfs.onDidChange(() => {
+		client.sendNotification("webgal/vfsChanged");
+	});
+	return client;
+};
+
+//#endregion
+//#region src/monaco/monaco-init.ts
+let initPromise = null;
+const initResources = {
+	"./webgal.tmLanguage.json": webgalGrammar,
+	"./webgal-config.tmLanguage.json": webgalConfigGrammar,
+	"./language-configuration.json": webgalLanguageConfiguration,
+	"./dark.json": webgalDarkTheme,
+	"./white.json": webgalWhiteTheme
+};
+async function initWebgalMonaco() {
+	if (initPromise) return initPromise;
+	initPromise = (async () => {
+		const { registerFileUrl } = registerExtension({
+			name: "webgal",
+			publisher: "openwebgal",
+			version: "1.0.0",
+			engines: { vscode: "^1.0.0" },
+			activationEvents: ["onLanguage:webgal", "onLanguage:webgal-config"],
+			contributes: {
+				languages: [{
+					id: "webgal",
+					extensions: [".webgal"],
+					aliases: ["WebGAL"],
+					configuration: "./language-configuration.json"
+				}, {
+					id: "webgal-config",
+					extensions: [".webgal-config"],
+					aliases: ["WebGAL Config"]
+				}],
+				grammars: [{
+					language: "webgal",
+					scopeName: "source.webgal",
+					path: "./webgal.tmLanguage.json"
+				}, {
+					language: "webgal-config",
+					scopeName: "source.webgal-config",
+					path: "./webgal-config.tmLanguage.json"
+				}],
+				themes: [{
+					id: "webgal-dark",
+					label: "WebGAL Dark",
+					uiTheme: "vs-dark",
+					path: "./dark.json"
+				}, {
+					id: "webgal-white",
+					label: "WebGAL White",
+					uiTheme: "vs",
+					path: "./white.json"
+				}]
+			}
+		}, ExtensionHostKind.LocalProcess);
+		for (const [key, value] of Object.entries(initResources)) registerFileUrl(key, new URL("data:application/json;base64," + btoa(decodeURIComponent(encodeURIComponent(JSON.stringify(value)))), import.meta.url).href);
+		await initialize({
+			...getTextMateServiceOverride(),
+			...getThemeServiceOverride(),
+			...getLanguagesServiceOverride()
+		});
+	})();
+	return initPromise;
+}
+
+//#endregion
+export { createMemoryFileSystem, createWebgalMonacoLanguageClient, createWebgalMonacoLanguageClientWithWorker, initResources, initWebgalMonaco };

package/build/node.d.cts

@@ -1,5 +1,4 @@
-import { C as VirtualFileSystem } from "./monaco-init-DUnVu1qx.cjs";
-import "./index.cjs";
+import { c as VirtualFileSystem } from "./types-BPQnQEAd.cjs";
 
 //#region src/node.d.ts
 type NodeFileSystemOptions = {

package/build/node.d.mts

@@ -1,5 +1,4 @@
-import { C as VirtualFileSystem } from "./monaco-init-BR2AgVuN.mjs";
-import "./index.mjs";
+import { c as VirtualFileSystem } from "./types-FltMUZDB.mjs";
 
 //#region src/node.d.ts
 type NodeFileSystemOptions = {

package/build/{monaco-init-BR2AgVuN.d.mts → types-BPQnQEAd.d.cts}

@@ -1,7 +1,5 @@
-import { createMemoryFileSystem } from "./index.mjs";
 import { FileSystem } from "@volar/language-service";
 import { URI } from "vscode-uri";
-import "vscode/localExtensionHost";
 
 //#region src/vfs/types.d.ts
 type DirectoryEntry = {
@@ -65,6 +63,7 @@ type VirtualFileSystem = {
   onDidChange: (listener: VirtualFileSystemChangeListener) => () => void;
 };
 type WebgalClientHandlers = {
+  "workspace/documentLink/refresh": () => MaybePromise<unknown>;
   "client/showTip": (message: string) => MaybePromise<unknown>;
   "client/currentDirectory": () => MaybePromise<string | null>;
   "client/FJoin": (args: string | string[]) => MaybePromise<string | null>;
@@ -109,50 +108,4 @@ interface VolarWritableFileSystem extends FileSystem {
   root: string;
 }
 //#endregion
-//#region src/client-handlers.d.ts
-declare function createWebgalClientHandlers(options: CreateWebgalClientHandlersOptions): WebgalClientHandlers;
-declare function registerWebgalClientHandlers(client: LanguageClientLike, handlers: Partial<WebgalClientHandlers>): void;
-//#endregion
-//#region src/vfs/adapter.d.ts
-declare function createVirtualFileSystem(fs: VolarWritableFileSystem): VirtualFileSystem;
-declare function createVolarFileSystem(vfs: VirtualFileSystem, options?: {
-  uriToPath?: (uri: URI) => string;
-}): FileSystem;
-//#endregion
-//#region src/vfs/memory.d.ts
-declare function createMemoryVolarFileSystem(options?: {
-  root?: string;
-  tree?: VirtualEntry;
-}): VolarWritableFileSystem;
-//#endregion
-//#region src/vfs/utils.d.ts
-declare const normalizePath: (input: string) => string;
-declare const joinPaths: (...parts: string[]) => string;
-declare const uriToPath: (value: string | URI) => string;
-declare const pathToUri: (path: string) => URI;
-declare const toVfsPath: (value: string) => string;
-//#endregion
-//#region src/monaco/monaco.d.ts
-interface CreateWebgalMonacoLanguageClientOptions {
-  languageServerUrl: string;
-  editor: any;
-  virtualFileSystem?: ReturnType<typeof createMemoryFileSystem>;
-}
-declare const createWebgalMonacoLanguageClient: (options: CreateWebgalMonacoLanguageClientOptions) => {
-  webSocket: WebSocket;
-  vfs: ReturnType<typeof createMemoryFileSystem>;
-};
-interface CreateWebgalMonacoLanguageClientWorkerOptions {
-  editor: any;
-  worker: Worker;
-  virtualFileSystem?: ReturnType<typeof createMemoryFileSystem>;
-}
-declare const createWebgalMonacoLanguageClientWithWorker: (options: CreateWebgalMonacoLanguageClientWorkerOptions) => {
-  worker: Worker;
-  vfs: ReturnType<typeof createMemoryFileSystem>;
-};
-//#endregion
-//#region src/monaco/monaco-init.d.ts
-declare function initWebgalMonaco(): Promise<void>;
-//#endregion
-export { VirtualFileSystem as C, WebgalClientHandlers as D, VolarWritableFileSystem as E, VirtualFileEntry as S, VirtualFileSystemChangeListener as T, DirectoryEntry as _, createWebgalMonacoLanguageClientWithWorker as a, VirtualDirectoryEntry as b, pathToUri as c, createMemoryVolarFileSystem as d, createVirtualFileSystem as f, CreateWebgalClientHandlersOptions as g, registerWebgalClientHandlers as h, createWebgalMonacoLanguageClient as i, toVfsPath as l, createWebgalClientHandlers as m, CreateWebgalMonacoLanguageClientOptions as n, joinPaths as o, createVolarFileSystem as p, CreateWebgalMonacoLanguageClientWorkerOptions as r, normalizePath as s, initWebgalMonaco as t, uriToPath as u, LanguageClientLike as v, VirtualFileSystemChange as w, VirtualEntry as x, MaybePromise as y };
+export { VirtualDirectoryEntry as a, VirtualFileSystem as c, VolarWritableFileSystem as d, WebgalClientHandlers as f, MaybePromise as i, VirtualFileSystemChange as l, DirectoryEntry as n, VirtualEntry as o, LanguageClientLike as r, VirtualFileEntry as s, CreateWebgalClientHandlersOptions as t, VirtualFileSystemChangeListener as u };

package/build/{monaco-init-DUnVu1qx.d.cts → types-FltMUZDB.d.mts}

@@ -1,7 +1,5 @@
-import { createMemoryFileSystem } from "./index.cjs";
 import { FileSystem } from "@volar/language-service";
 import { URI } from "vscode-uri";
-import "vscode/localExtensionHost";
 
 //#region src/vfs/types.d.ts
 type DirectoryEntry = {
@@ -65,6 +63,7 @@ type VirtualFileSystem = {
   onDidChange: (listener: VirtualFileSystemChangeListener) => () => void;
 };
 type WebgalClientHandlers = {
+  "workspace/documentLink/refresh": () => MaybePromise<unknown>;
   "client/showTip": (message: string) => MaybePromise<unknown>;
   "client/currentDirectory": () => MaybePromise<string | null>;
   "client/FJoin": (args: string | string[]) => MaybePromise<string | null>;
@@ -109,50 +108,4 @@ interface VolarWritableFileSystem extends FileSystem {
   root: string;
 }
 //#endregion
-//#region src/client-handlers.d.ts
-declare function createWebgalClientHandlers(options: CreateWebgalClientHandlersOptions): WebgalClientHandlers;
-declare function registerWebgalClientHandlers(client: LanguageClientLike, handlers: Partial<WebgalClientHandlers>): void;
-//#endregion
-//#region src/vfs/adapter.d.ts
-declare function createVirtualFileSystem(fs: VolarWritableFileSystem): VirtualFileSystem;
-declare function createVolarFileSystem(vfs: VirtualFileSystem, options?: {
-  uriToPath?: (uri: URI) => string;
-}): FileSystem;
-//#endregion
-//#region src/vfs/memory.d.ts
-declare function createMemoryVolarFileSystem(options?: {
-  root?: string;
-  tree?: VirtualEntry;
-}): VolarWritableFileSystem;
-//#endregion
-//#region src/vfs/utils.d.ts
-declare const normalizePath: (input: string) => string;
-declare const joinPaths: (...parts: string[]) => string;
-declare const uriToPath: (value: string | URI) => string;
-declare const pathToUri: (path: string) => URI;
-declare const toVfsPath: (value: string) => string;
-//#endregion
-//#region src/monaco/monaco.d.ts
-interface CreateWebgalMonacoLanguageClientOptions {
-  languageServerUrl: string;
-  editor: any;
-  virtualFileSystem?: ReturnType<typeof createMemoryFileSystem>;
-}
-declare const createWebgalMonacoLanguageClient: (options: CreateWebgalMonacoLanguageClientOptions) => {
-  webSocket: WebSocket;
-  vfs: ReturnType<typeof createMemoryFileSystem>;
-};
-interface CreateWebgalMonacoLanguageClientWorkerOptions {
-  editor: any;
-  worker: Worker;
-  virtualFileSystem?: ReturnType<typeof createMemoryFileSystem>;
-}
-declare const createWebgalMonacoLanguageClientWithWorker: (options: CreateWebgalMonacoLanguageClientWorkerOptions) => {
-  worker: Worker;
-  vfs: ReturnType<typeof createMemoryFileSystem>;
-};
-//#endregion
-//#region src/monaco/monaco-init.d.ts
-declare function initWebgalMonaco(): Promise<void>;
-//#endregion
-export { VirtualFileSystem as C, WebgalClientHandlers as D, VolarWritableFileSystem as E, VirtualFileEntry as S, VirtualFileSystemChangeListener as T, DirectoryEntry as _, createWebgalMonacoLanguageClientWithWorker as a, VirtualDirectoryEntry as b, pathToUri as c, createMemoryVolarFileSystem as d, createVirtualFileSystem as f, CreateWebgalClientHandlersOptions as g, registerWebgalClientHandlers as h, createWebgalMonacoLanguageClient as i, toVfsPath as l, createWebgalClientHandlers as m, CreateWebgalMonacoLanguageClientOptions as n, joinPaths as o, createVolarFileSystem as p, CreateWebgalMonacoLanguageClientWorkerOptions as r, normalizePath as s, initWebgalMonaco as t, uriToPath as u, LanguageClientLike as v, VirtualFileSystemChange as w, VirtualEntry as x, MaybePromise as y };
+export { VirtualDirectoryEntry as a, VirtualFileSystem as c, VolarWritableFileSystem as d, WebgalClientHandlers as f, MaybePromise as i, VirtualFileSystemChange as l, DirectoryEntry as n, VirtualEntry as o, LanguageClientLike as r, VirtualFileEntry as s, CreateWebgalClientHandlersOptions as t, VirtualFileSystemChangeListener as u };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webgal/language-service",
-	"version": "0.0.2-alpha.2",
+	"version": "0.0.2-alpha.4",
 	"type": "module",
 	"main": "build/index.cjs",
 	"module": "build/index.mjs",
@@ -26,14 +26,9 @@
 			"require": "./build/node.cjs"
 		},
 		"./monaco": {
-			"types": "./build/monaco.d.mts",
-			"import": "./build/monaco.mjs",
-			"require": "./build/monaco.cjs"
-		},
-		"./monaco-init": {
-			"types": "./build/monaco-init.d.mts",
-			"import": "./build/monaco-init.mjs",
-			"require": "./build/monaco-init.cjs"
+			"types": "./build/monaco/index.d.mts",
+			"import": "./build/monaco/index.mjs",
+			"require": "./build/monaco/index.cjs"
 		},
 		"./syntaxes": {
 			"types": "./build/syntaxes.d.mts",
@@ -55,7 +50,6 @@
 	},
 	"devDependencies": {
 		"@types/node": "^18.0.0",
-		"monaco-editor": "^0.55.1",
 		"tsdown": "^0.20.3"
 	},
 	"dependencies": {
@@ -65,11 +59,12 @@
 		"@codingame/monaco-vscode-theme-service-override": "^26.1.1",
 		"@volar/language-core": "^2.4.28",
 		"@volar/language-service": "^2.4.28",
+		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^26.1.1",
 		"monaco-languageclient": "^10.7.0",
-		"vscode": "npm:@codingame/monaco-vscode-extension-api@26.1.1",
+		"vscode": "npm:@codingame/monaco-vscode-extension-api@^26.1.1",
 		"vscode-languageclient": "^9.0.1",
 		"vscode-uri": "^3.1.0",
 		"vscode-ws-jsonrpc": "^3.5.0"
 	},
-	"gitHead": "db8b60d474455cb41023f70d804d44bb8b96f3be"
+	"gitHead": "8ae85838b6fd53666ccdedaa6a1afcf5d51451ce"
 }