feat: 0.4.0 updates

Author: ItsMeBrianD

bun.lock

@@ -41,19 +41,22 @@
 		"@codemirror/lang-json": "^6.0.2",
 		"@codemirror/language": "^6.11.3",
 		"@codemirror/lint": "^6.8.5",
-		"@codemirror/lsp-client": "^6.1.1",
+		"@codemirror/lsp-client": "^6.1.2",
 		"@codemirror/search": "^6.5.11",
 		"@codemirror/view": "^6.38.1",
 		"@minecraftmetascript/mms-wasm": "../mms/result/js",
+		"@open-rpc/client-js": "^1.8.1",
 		"@spyglassmc/mcdoc": "^0.3.38",
 		"@steeze-ui/svelte-icon": "^1.6.2",
 		"@steeze-ui/tabler-icons": "^3.3.1",
 		"@sveltejs/adapter-static": "^3.0.9",
+		"@tailwindcss/typography": "^0.5.19",
 		"@types/golang-wasm-exec": "^1.15.2",
 		"@zip.js/zip.js": "^2.8.2",
 		"codemirror": "^6.0.2",
 		"deepslate": "^0.24.0",
 		"es-toolkit": "^1.39.10",
+		"svelte-exmarkdown": "^5.0.2",
 		"svelte-splitpanes": "^8.0.9",
 		"valibot": "^1.1.0"
 	}

package.json

@@ -1,5 +1,15 @@
 @import 'tailwindcss';
+@plugin "@tailwindcss/typography";
 
 button {
 	@apply cursor-pointer disabled:cursor-default;
 }
+.cm-tooltip.cm-tooltip-hover {
+	@apply bg-slate-200 px-1 py-0.5 text-xs;
+	& .cm-tooltip-arrow:before {
+		@apply bg-slate-700;
+	}
+	& .cm-tooltip-arrow:after {
+		@apply bg-transparent;
+	}
+}

src/app.css

@@ -2,6 +2,8 @@ import { Go, type FileTreeLike, type MmsSymbol } from '@minecraftmetascript/mms-
 import MMSWasm from '@minecraftmetascript/mms-wasm/dist/main.wasm?init';
 import * as deepslate from 'deepslate';
 import * as zip from '@zip.js/zip.js';
+import { debounce } from 'es-toolkit';
+
 export class MMSFile {
 	private _content: string;
 	get content() {
@@ -21,11 +23,12 @@ export class MMSFile {
 		this._diagnostics = $state([]);
 	}
 
+	private goUpdate = debounce(updateFile, 100);
 	async updateContent(content: string) {
 		if (!content) return;
 		this._content = content;
-		updateFile(this.filename, content, (...args) => {
-			this.project.onProjectUpdate(...args);
+		this.goUpdate(this.filename, content, (result: Uint8Array) => {
+			this.project.onProjectUpdate(atob(result.toBase64()));
 			getFileDiag(this.filename, (serialDiag: string) => {
 				if (serialDiag) this._diagnostics = JSON.parse(serialDiag);
 				else this._diagnostics = [];
@@ -57,11 +60,67 @@ export class MMSProject {
 		a.href = url;
 		a.download = 'project.zip';
 		a.click();
-		URL.revokeObjectURL(url);
+		// URL.revokeObjectURL(url);
 		a.remove();
 	}
 
+	private lspReaders = new Set<(s: string) => void>();
+	lspSub(fn: (s: string) => void) {
+		this.lspReaders.add(fn);
+	}
+	lspUnsub(fn: (s: string) => void) {
+		this.lspReaders.delete(fn);
+	}
+
+	partial: string | null = null;
+	lspRead = (s: string | Uint8Array) => {
+		let msgStr: string;
+		// chop off the header
+		if (s instanceof Uint8Array) {
+			msgStr = atob(s.toBase64());
+		} else {
+			msgStr = s;
+		}
+		try {
+			let message = msgStr.split('\r\n\r\n')[1];
+			if (message === '' || message === undefined) {
+				message = msgStr;
+			}
+			if (this.partial) {
+				if (message) message = this.partial + message;
+				else message = this.partial;
+			}
+			try {
+				JSON.parse(message);
+				console.log({ message: JSON.parse(message) });
+				this.partial = '';
+				this.lspReaders.forEach((r) => r(message));
+			} catch (e) {
+				if (message) {
+					this.partial = message;
+				} else console.warn(e);
+			}
+		} catch (e) {
+			console.error(e);
+		}
+	};
+	lspWrite(s: string) {
+		const encoder = new TextEncoder();
+
+		const body = encoder.encode(s);
+		const header = encoder.encode(`Content-Length: ${body.byteLength}\r\n\r\n`);
+
+		const packet = new Uint8Array(body.byteLength + header.byteLength);
+		packet.set(header, 0);
+		packet.set(body, header.byteLength);
+
+		// Send exact bytes
+		// @ts-ignore allow Uint8Array until typings are updated
+		globalThis.mmsLspWrite(packet);
+	}
+
 	async init(signal?: AbortSignal) {
+		globalThis.mmsLspRead = this.lspRead;
 		const wasmInstance = await MMSWasm(this.goInstance.importObject);
 		this.goInstance.run(wasmInstance).catch((err) => {
 			console.error('MMS WASM Failed: ', { err });
@@ -91,18 +150,20 @@ export class MMSProject {
 	get fs() {
 		return this._fs;
 	}
-	private _symbols: Record<string, MmsSymbol> | null;
+	private _symbols: Record<string, Record<string, MmsSymbol>> | null;
 	get symbols() {
 		return this._symbols;
 	}
-	private set symbols(next: Record<string, MmsSymbol> | null) {
-		for (const [k, v] of Object.entries(next ?? {})) {
-			switch (v.type) {
-				case 'Noise': {
-					deepslate.WorldgenRegistries.NOISE.register(
-						new deepslate.Identifier(...(v.ref.split(':') as [string, string])),
-						deepslate.NoiseParameters.fromJson(v.value)
-					);
+	private set symbols(next: Record<string, Record<string, MmsSymbol>> | null) {
+		for (const [ns, v] of Object.entries(next ?? {})) {
+			for (const [n, s] of Object.entries(v)) {
+				switch (s.kind) {
+					case 'Noise': {
+						deepslate.WorldgenRegistries.NOISE.register(
+							new deepslate.Identifier(ns, n),
+							deepslate.NoiseParameters.fromJson(s.kind)
+						);
+					}
 				}
 			}
 		}

src/lib/MMSProject.svelte.ts

@@ -1,10 +1,10 @@
 <script lang="ts" module>
-	export const SupportedPreviewTypes = ['DensityFunction', 'Noise'];
+	export const SupportedPreviewTypes = ['DensityFunction', 'Noise', 'NoiseSettings'];
 </script>
 
 <script lang="ts">
 	import type { MouseEventHandler } from 'svelte/elements';
-	import DeepslateRenderWorker from './deepslate_render_worker?worker';
+	import DeepslateRenderWorker from './worker/deepslate_render_worker?worker';
 	import type { Action } from 'svelte/action';
 	import {
 		DeepslateRenderWorkerMessageSchema,
@@ -67,23 +67,25 @@
 				send({
 					kind: 'update::preview',
 					value: JSON.stringify(editor.previewSymbol.value),
-					type: editor.previewSymbol.type
+					type: editor.previewSymbol.kind
 				});
 			}
 		});
 
 		$effect(() => {
-			for (const symbol of Object.values(editor.project.symbols ?? {})) {
-				if (symbol.type === 'Noise') {
-					const ref = symbol.ref.split(':');
-					send({
-						kind: 'injest::noise',
-						ref: {
-							namespace: ref[0],
-							name: ref[1]
-						},
-						value: JSON.stringify(symbol.value)
-					});
+			for (const nsSymbols of Object.values(editor.project.symbols ?? {})) {
+				for (const symbol of Object.values(nsSymbols)) {
+					if (symbol.kind === 'Noise') {
+						const ref = symbol.ref.split(':');
+						send({
+							kind: 'injest::noise',
+							ref: {
+								namespace: ref[0],
+								name: ref[1]
+							},
+							value: JSON.stringify(symbol.value)
+						});
+					}
 				}
 			}
 		});
@@ -127,7 +129,7 @@
 				case 'response::value_at_point':
 					mousePosLabel = {
 						label: message.label,
-						value: message.value.toFixed(2)
+						value: typeof message.value === 'number' ? message.value.toFixed(2) : message.value
 					};
 			}
 		});

src/lib/deepslate/DeepslateRendererOffloaded.svelte

@@ -40,7 +40,7 @@ export const RequestValueAtPoint = v.object({
 export const ResponseValueAtPoint = v.object({
 	kind: v.literal('response::value_at_point'),
 	point: PointSchema,
-	value: v.number(),
+	value: v.union([v.number(), v.string()]),
 	label: v.string()
 });