Get wasm bundling working

packages/extension/.eslintrc.js

@@ -0,0 +1,20 @@
+/**@type {import('eslint').Linter.Config} */
+// eslint-disable-next-line no-undef
+module.exports = {
+	root: true,
+	parser: '@typescript-eslint/parser',
+	plugins: [
+		'@typescript-eslint',
+	],
+	extends: [
+		'eslint:recommended',
+		'plugin:@typescript-eslint/recommended',
+	],
+	rules: {
+		'semi': [2, "always"],
+		'@typescript-eslint/no-unused-vars': 0,
+		'@typescript-eslint/no-explicit-any': 0,
+		'@typescript-eslint/explicit-module-boundary-types': 0,
+		'@typescript-eslint/no-non-null-assertion': 0,
+	}
+};

packages/extension/.gitignore

@@ -0,0 +1,13 @@
+.DS_Store
+npm-debug.log
+Thumbs.db
+*/node_modules/
+node_modules/
+*/out/
+out/
+*/.vs/
+.vs/
+tsconfig.lsif.json
+*.lsif
+*.db
+*.vsix

packages/extension/.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}

packages/extension/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "dioxus-ext"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+wasm-bindgen.workspace = true
+dioxus-autofmt.workspace = true
+rsx-rosetta.workspace = true
+html_parser.workspace = true
+
+
+[lib]
+crate-type = ["cdylib", "rlib"]

packages/extension/DEV.md

@@ -0,0 +1,10 @@
+
+## packaging
+
+```
+$ cd myExtension
+$ vsce package
+# myExtension.vsix generated
+$ vsce publish
+# <publisherID>.myExtension published to VS Code Marketplace
+```

packages/extension/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 DioxusLabs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/extension/README.md

@@ -0,0 +1,14 @@
+# Dioxus VSCode Extension
+
+![Dioxus Logo](https://dioxuslabs.com/guide/images/dioxuslogo_full.png)
+
+This extension wraps functionality in Dioxus CLI to be used in your editor! Make sure the dioxus-cli is installed before using this extension.
+
+## Current commands:
+
+### Convert HTML to RSX
+Converts a selection of html to valid rsx.
+
+### Convert HTML to Dioxus Component
+
+Converts a selection of html to a valid Dioxus component with all SVGs factored out into their own module.

packages/extension/package.json

@@ -0,0 +1,108 @@
+{
+    "name": "dioxus",
+    "displayName": "Dioxus",
+    "description": "Useful tools for working with Dioxus",
+    "version": "0.0.1",
+    "publisher": "DioxusLabs",
+    "private": true,
+    "license": "MIT",
+    "icon": "static/icon.png",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/DioxusLabs/cli"
+    },
+    "engines": {
+        "vscode": "^1.68.1"
+    },
+    "categories": [
+        "Programming Languages"
+    ],
+    "activationEvents": [
+        "onCommand:extension.htmlToDioxusRsx",
+        "onCommand:extension.htmlToDioxusComponent",
+        "onCommand:extension.formatRsx",
+        "onCommand:extension.formatRsxDocument"
+    ],
+    "main": "./out/main",
+    "extensionKind": [
+        "ui",
+        "workspace"
+    ],
+    "contributes": {
+        "commands": [
+            {
+                "command": "extension.htmlToDioxusRsx",
+                "title": "Dioxus: Convert HTML to RSX"
+            },
+            {
+                "command": "extension.htmlToDioxusComponent",
+                "title": "Dioxus: Convert HTML to Component"
+            },
+            {
+                "command": "extension.formatRsx",
+                "title": "Dioxus: Format RSX"
+            },
+            {
+                "command": "extension.formatRsxDocument",
+                "title": "Dioxus: Format RSX Document"
+            }
+        ],
+        "configuration": {
+            "properties": {
+                "dioxus.formatOnSave": {
+                    "type": [
+                        "string"
+                    ],
+                    "default": "followFormatOnSave",
+                    "enum": [
+                        "followFormatOnSave",
+                        "enabled",
+                        "disabled"
+                    ],
+                    "enumItemLabels": [
+                        "Follow the normal formatOnSave config",
+                        "Enabled",
+                        "Disabled"
+                    ],
+                    "enumDescriptions": [
+                        "Only format Rsx when saving files if the editor.formatOnSave config is enabled",
+                        "Always format Rsx when a Rust file is saved",
+                        "Never format Rsx when a file is saved"
+                    ],
+                    "description": "Format RSX when a file is saved."
+                }
+            }
+        }
+    },
+    "scripts": {
+        "vscode:prepublish": "npm run build-base -- --minify",
+        "package": "vsce package -o rust-analyzer.vsix",
+        "build-base": "node src/build.js",
+        "build": "npm run build-base -- --sourcemap",
+        "watch": "npm run build-base -- --sourcemap --watch",
+        "lint": "prettier --check . && eslint -c .eslintrc.js --ext ts ./src ./tests",
+        "fix": "prettier --write . && eslint -c .eslintrc.js --ext ts ./src ./tests --fix",
+        "pretest": "tsc && npm run build",
+        "test": "cross-env TEST_VARIABLE=test node ./out/tests/runTests.js"
+    },
+    "devDependencies": {
+        "@types/node": "^18.0.2",
+        "@types/vscode": "^1.68.1",
+        "@typescript-eslint/eslint-plugin": "^5.30.5",
+        "@typescript-eslint/parser": "^5.30.5",
+        "cross-env": "^7.0.3",
+        "esbuild": "^0.14.27",
+        "esbuild-plugin-wasm": "^1.1.0",
+        "eslint": "^8.19.0",
+        "eslint-config-prettier": "^8.5.0",
+        "ovsx": "^0.5.1",
+        "prettier": "^2.6.2",
+        "tslib": "^2.3.0",
+        "typescript": "^4.7.4",
+        "vsce": "^2.7.0"
+    },
+    "dependencies": {
+        "dioxus-ext": "./pkg",
+        "vsce": "^2.9.2"
+    }
+}

packages/extension/src/build.js

@@ -0,0 +1,23 @@
+// build.ts
+import('esbuild').then((esbuild) => {
+  import('esbuild-plugin-wasm').then((wasmLoader) => {
+    // "build-base": "esbuild ./src/main.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node --target=node16",
+    esbuild.build({
+      entryPoints: ['src/main.ts'],
+      outfile: 'out/main.js',
+      bundle: true,
+      platform: 'node',
+      target: 'node16',
+      format: 'esm',
+      external: ['vscode'],
+      plugins: [
+        wasmLoader.wasmLoader({
+          mode: 'embedded'
+        })
+      ]
+    });
+  });
+});
+
+
+

packages/extension/src/lib.rs

@@ -0,0 +1,34 @@
+//! This file exports functions into the vscode extension
+
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub fn greeet() {
+    //
+}
+
+#[wasm_bindgen]
+pub fn format_rsx(raw: String) -> String {
+    let block = dioxus_autofmt::fmt_block(&raw, 0);
+    block.unwrap()
+}
+
+#[wasm_bindgen]
+pub fn translate_rsx(contents: String, component: bool) -> String {
+    // Ensure we're loading valid HTML
+    let dom = html_parser::Dom::parse(&contents).unwrap();
+
+    let callbody = rsx_rosetta::rsx_from_html(&dom);
+
+    // Convert the HTML to RSX
+    let out = dioxus_autofmt::write_block_out(callbody).unwrap();
+
+    out
+}
+
+// rsx! {
+//     div {}
+//     div {}
+//     div {}
+//     div {} div {}
+// }

packages/extension/src/main.ts

@@ -0,0 +1,277 @@
+import * as vscode from 'vscode';
+import { translate_rsx } from 'dioxus-ext';
+
+
+export async function activate(context: vscode.ExtensionContext) {
+
+
+	context.subscriptions.push(
+		vscode.commands.registerCommand('extension.htmlToDioxusRsx', () => translate(false)),
+		vscode.commands.registerCommand('extension.htmlToDioxusComponent', () => translate(true)),
+		// vscode.commands.registerCommand('extension.formatRsx', fmtSelection),
+		// vscode.commands.registerCommand('extension.formatRsxDocument', formatRsxDocument),
+		// vscode.workspace.onWillSaveTextDocument(fmtDocumentOnSave)
+	);
+}
+
+function translate(component: boolean) {
+	const editor = vscode.window.activeTextEditor;
+
+	if (!editor) return;
+
+	const html = editor.document.getText(editor.selection);
+	if (html.length == 0) {
+		vscode.window.showWarningMessage("Please select HTML fragment before invoking this command!");
+		return;
+	}
+
+	const out = translate_rsx(html, component);
+
+	if (out.length > 0) {
+		editor.edit(editBuilder => editBuilder.replace(editor.selection, out));
+	} else {
+		vscode.window.showWarningMessage(`Errors occurred while translating, make sure this block of HTML is valid`);
+	}
+
+	// const params = ["translate"];
+	// if (component) params.push("--component");
+	// params.push("--raw", html);
+
+	// const child_proc = spawn(serverPath, params);
+
+	// let result = '';
+	// child_proc.stdout?.on('data', data => result += data);
+
+	// child_proc.on('close', () => {
+	// 	if (result.length > 0) editor.edit(editBuilder => editBuilder.replace(editor.selection, result));
+	// });
+
+	// child_proc.on('error', (err) => {
+	// 	vscode.window.showWarningMessage(`Errors occurred while translating. Make sure you have the most recent Dioxus-CLI installed! \n${err}`);
+	// });
+}
+
+
+
+// function formatRsxDocument() {
+// 	const editor = vscode.window.activeTextEditor;
+// 	if (!editor) return;
+// 	fmtDocument(editor.document);
+// }
+
+// function fmtSelection() {
+// 	const editor = vscode.window.activeTextEditor;
+// 	if (!editor) return;
+
+// 	const unformatted = editor.document.getText(editor.selection);
+
+// 	if (unformatted.length == 0) {
+// 		vscode.window.showWarningMessage("Please select rsx invoking this command!");
+// 		return;
+// 	}
+
+// 	const fileDir = editor.document.fileName.slice(0, editor.document.fileName.lastIndexOf('\\'));
+
+// const child_proc = spawn(serverPath, ["fmt", "--raw", unformatted.toString()], {
+// 	cwd: fileDir ? fileDir : undefined,
+// });
+// let result = '';
+
+// child_proc.stdout?.on('data', data => result += data);
+
+// child_proc.on('close', () => {
+// 	if (result.length > 0) editor.edit(editBuilder => editBuilder.replace(editor.selection, result));
+// });
+
+// child_proc.on('error', (err) => {
+// 	vscode.window.showWarningMessage(`Errors occurred while translating. Make sure you have the most recent Dioxus-CLI installed! \n${err}`);
+// });
+// }
+
+// function fmtDocumentOnSave(e: vscode.TextDocumentWillSaveEvent) {
+// 	// check the settings to make sure format on save is configured
+// 	const dioxusConfig = vscode.workspace.getConfiguration('dioxus', e.document).get('formatOnSave');
+// 	const globalConfig = vscode.workspace.getConfiguration('editor', e.document).get('formatOnSave');
+// 	if (
+// 		(dioxusConfig === 'enabled') ||
+// 		(dioxusConfig !== 'disabled' && globalConfig)
+// 	) {
+// 		fmtDocument(e.document);
+// 	}
+// }
+
+// function fmtDocument(document: vscode.TextDocument) {
+// 	try {
+// 		if (document.languageId !== "rust" || document.uri.scheme !== "file") {
+// 			return;
+// 		}
+
+// 		const [editor,] = vscode.window.visibleTextEditors.filter(editor => editor.document.fileName === document.fileName);
+// 		if (!editor) return; // Need an editor to apply text edits.
+
+// 		const fileDir = document.fileName.slice(0, document.fileName.lastIndexOf('\\'));
+// 		const child_proc = spawn(serverPath, ["fmt", "--file", document.fileName], {
+// 			cwd: fileDir ? fileDir : undefined,
+// 		});
+
+// 		let result = '';
+// 		child_proc.stdout?.on('data', data => result += data);
+
+// 		/*type RsxEdit = {
+// 			formatted: string,
+// 			start: number,
+// 			end: number
+// 		}*/
+
+// 		child_proc.on('close', () => {
+// 			if (child_proc.exitCode !== 0) {
+// 				vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\nDioxus-CLI exited with exit code ${child_proc.exitCode}\n\nData from Dioxus-CLI:\n${result}`);
+// 				return;
+// 			}
+
+// 		});
+
+// 		child_proc.on('error', (err) => {
+// 			vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed! \n${err}`);
+// 		});
+// 	} catch (error) {
+// 		vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed! \n${error}`);
+// 	}
+// }
+
+
+
+// // I'm using the approach defined in rust-analyzer here
+// //
+// // We ship the server as part of the extension, but we need to handle external paths and such
+// //
+// // https://github.com/rust-lang/rust-analyzer/blob/fee5555cfabed4b8abbd40983fc4442df4007e49/editors/code/src/main.ts#L270
+// async function bootstrap(context: vscode.ExtensionContext): Promise<string | undefined> {
+
+// 	const ext = process.platform === "win32" ? ".exe" : "";
+// 	const bundled = vscode.Uri.joinPath(context.extensionUri, "server", `dioxus${ext}`);
+// 	const bundledExists = await vscode.workspace.fs.stat(bundled).then(
+// 		() => true,
+// 		() => false
+// 	);
+
+// 	// if bunddled doesn't exist, try using a locally-installed version
+// 	if (!bundledExists) {
+// 		return "dioxus";
+// 	}
+
+// 	return bundled.fsPath;
+// }
+
+
+// function onPasteHandler() {
+// 	// check settings to see if we should convert HTML to Rsx
+// 	if (vscode.workspace.getConfiguration('dioxus').get('convertOnPaste')) {
+// 		convertHtmlToRsxOnPaste();
+// 	}
+// }
+
+// function convertHtmlToRsxOnPaste() {
+// 	const editor = vscode.window.activeTextEditor;
+// 	if (!editor) return;
+
+// 	// get the cursor location
+// 	const cursor = editor.selection.active;
+
+// 	// try to parse the HTML at the cursor location
+// 	const html = editor.document.getText(new vscode.Range(cursor, cursor));
+// }
+
+/*if (result.length === 0) return;
+
+// Used for error message:
+const originalResult = result;
+try {
+	// Only parse the last non empty line, to skip log warning messages:
+	const lines = result.replaceAll('\r\n', '\n').split('\n');
+	const nonEmptyLines = lines.filter(line => line.trim().length !== 0);
+	result = nonEmptyLines[nonEmptyLines.length - 1] ?? '';
+
+	if (result.length === 0) return;
+
+	const decoded: RsxEdit[] = JSON.parse(result);
+	if (decoded.length === 0) return;
+
+	// Preform edits at the end of the file
+	// first (to not change previous text file
+	// offsets):
+	decoded.sort((a, b) => b.start - a.start);
+
+
+	// Convert from utf8 offsets to utf16 offsets used by VS Code:
+
+	const utf8Text = new TextEncoder().encode(text);
+	const utf8ToUtf16Pos = (posUtf8: number) => {
+		// Find the line of the position as well as the utf8 and
+		// utf16 indexes for the start of that line:
+		let startOfLineUtf8 = 0;
+		let lineIndex = 0;
+		const newLineUtf8 = '\n'.charCodeAt(0);
+		// eslint-disable-next-line no-constant-condition
+		while (true) {
+			const nextLineAt = utf8Text.indexOf(newLineUtf8, startOfLineUtf8);
+			if (nextLineAt < 0 || posUtf8 <= nextLineAt) break;
+			startOfLineUtf8 = nextLineAt + 1;
+			lineIndex++;
+		}
+		const lineUtf16 = document.lineAt(lineIndex);
+
+		// Move forward from a synced position in the text until the
+		// target pos is found:
+		let currentUtf8 = startOfLineUtf8;
+		let currentUtf16 = document.offsetAt(lineUtf16.range.start);
+
+		const decodeBuffer = new Uint8Array(10);
+		const utf8Encoder = new TextEncoder();
+		while (currentUtf8 < posUtf8) {
+			const { written } = utf8Encoder.encodeInto(text.charAt(currentUtf16), decodeBuffer);
+			currentUtf8 += written;
+			currentUtf16++;
+		}
+		return currentUtf16;
+	};
+
+
+	type FixedEdit = {
+		range: vscode.Range,
+		formatted: string,
+	};
+
+	const edits: FixedEdit[] = [];
+	for (const edit of decoded) {
+		// Convert from utf8 to utf16:
+		const range = new vscode.Range(
+			document.positionAt(utf8ToUtf16Pos(edit.start)),
+			document.positionAt(utf8ToUtf16Pos(edit.end))
+		);
+
+		if (editor.document.getText(range) !== document.getText(range)) {
+			// The text that was formatted has changed while we were working.
+			vscode.window.showWarningMessage(`Dioxus formatting was ignored since the source file changed before the change could be applied.`);
+			continue;
+		}
+
+		edits.push({
+			range,
+			formatted: edit.formatted,
+		});
+	}
+
+
+	// Apply edits:
+	editor.edit(editBuilder => {
+		edits.forEach((edit) => editBuilder.replace(edit.range, edit.formatted));
+	}, {
+		undoStopAfter: false,
+		undoStopBefore: false
+	});
+
+} catch (err) {
+	vscode.window.showWarningMessage(`Errors occurred while formatting. Make sure you have the most recent Dioxus-CLI installed!\n${err}\n\nData from Dioxus-CLI:\n${originalResult}`);
+}*/
+// import { TextEncoder } from 'util';

packages/extension/tsconfig.json

@@ -0,0 +1,18 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es2021",
+		"lib": [
+			"ES2021"
+		],
+		"outDir": "out",
+		"sourceMap": true,
+		"strict": true,
+		"rootDir": "src"
+	},
+	"exclude": [
+		"node_modules",
+		".vscode-test"
+		// "src/pkg"
+	]
+}