@wasm-fmt/gofmt 0.3.0 → 0.3.3

package/go_wasm.js

@@ -6,7 +6,6 @@
 
 	const encoder = new TextEncoder("utf-8");
 	const decoder = new TextDecoder("utf-8");
-	var logLine = [];
 
 	export class Go {
 		constructor() {
@@ -125,50 +124,12 @@
 			this.importObject = {
 				wasi_snapshot_preview1: {
 					// https://github.com/WebAssembly/WASI/blob/main/phases/snapshot/docs.md#fd_write
-					fd_write: function(fd, iovs_ptr, iovs_len, nwritten_ptr) {
-						let nwritten = 0;
-						if (fd == 1) {
-							for (let iovs_i=0; iovs_i<iovs_len;iovs_i++) {
-								let iov_ptr = iovs_ptr+iovs_i*8; // assuming wasm32
-								let ptr = mem().getUint32(iov_ptr + 0, true);
-								let len = mem().getUint32(iov_ptr + 4, true);
-								nwritten += len;
-								for (let i=0; i<len; i++) {
-									let c = mem().getUint8(ptr+i);
-									if (c == 13) { // CR
-										// ignore
-									} else if (c == 10) { // LF
-										// write line
-										let line = decoder.decode(new Uint8Array(logLine));
-										logLine = [];
-										console.log(line);
-									} else {
-										logLine.push(c);
-									}
-								}
-							}
-						} else {
-							console.error('invalid file descriptor:', fd);
-						}
-						mem().setUint32(nwritten_ptr, nwritten, true);
-						return 0;
-					},
-					fd_close: () => 0,      // dummy
-					fd_fdstat_get: () => 0, // dummy
-					fd_seek: () => 0,       // dummy
-					"proc_exit": (code) => {
-						if (global.process) {
-							// Node.js
-							process.exit(code);
-						} else {
-							// Can't exit in a browser.
-							throw 'trying to exit with code ' + code;
-						}
-					},
-					random_get: (bufPtr, bufLen) => {
-						crypto.getRandomValues(loadSlice(bufPtr, bufLen));
-						return 0;
-					},
+					fd_write() {},
+					fd_close() {},
+					fd_fdstat_get() {},
+					fd_seek() {},
+					proc_exit() {},
+					random_get() {}
 				},
 				env: {
 					// func ticks() float64
@@ -337,22 +298,6 @@
 			};
 		}
 
-		storeString(str) {
-			const addr = this._inst.exports.getBuffer();
-			const buf = this._inst.exports.memory.buffer;
-
-			const mem = new Uint8Array(buf);
-			const view = mem.subarray(addr);
-			return encoder.encodeInto(str, view).written;
-		}
-
-		loadString(len) {
-			const addr = this._inst.exports.getBuffer();
-			const buf = this._inst.exports.memory.buffer;
-
-			return decoder.decode(new DataView(buf, addr, len));
-		}
-
 		async run(instance) {
 			this._inst = instance;
 			this._values = [ // JS values that Go currently has references to, indexed by reference id
@@ -361,7 +306,12 @@
 				null,
 				true,
 				false,
-				"undefined" != typeof globalThis ? globalThis : global || self,
+				// fake global
+				{
+					set format(fn){ instance.format = fn; },
+					Array,
+					Object,
+				},
 				this,
 			];
 			this._goRefCounts = []; // number of references that Go has to a JS value, indexed by reference id
@@ -369,8 +319,6 @@
 			this._idPool = [];      // unused ids that have been garbage collected
 			this.exited = false;    // whether the Go program has exited
 
-			const mem = new DataView(this._inst.exports.memory.buffer)
-
 			while (true) {
 				const callbackPromise = new Promise((resolve) => {
 					this._resolveCallbackPromise = () => {

package/lib.js

@@ -1,44 +1,47 @@
 import { Go } from "./go_wasm.js";
 const go = new Go();
 
-let mod;
+let inst;
 
 export default async function init(wasm_url) {
-    if (!mod) {
-        if (!wasm_url) {
-            wasm_url = new URL("lib.wasm", import.meta.url);
-        }
+    if (inst) {
+        return await inst;
+    }
 
-        if (typeof wasm_url === "string") {
-            wasm_url = new URL(wasm_url);
-        }
+    if (!wasm_url) {
+        wasm_url = new URL("lib.wasm", import.meta.url);
+    }
 
-        if (
-            typeof __webpack_require__ !== "function" &&
-            wasm_url.protocol === "file:"
-        ) {
-            const fs = await import("node:fs");
-            const bytes = fs.readFileSync(wasm_url);
-            mod = new WebAssembly.Module(bytes);
-        } else if ("compileStreaming" in WebAssembly) {
-            mod = await WebAssembly.compileStreaming(fetch(wasm_url));
-        } else {
-            const response = await fetch(wasm_url);
-            const bytes = await response.arrayBuffer();
-            mod = new WebAssembly.Module(bytes);
-        }
+    if (typeof wasm_url === "string") {
+        wasm_url = new URL(wasm_url, import.meta.url);
     }
-}
 
-export function format(input) {
-    const inst = new WebAssembly.Instance(mod, go.importObject);
+    if (
+        typeof __webpack_require__ !== "function" &&
+        wasm_url.protocol === "file:"
+    ) {
+        inst = import("node:fs/promises")
+            .then((fs) => fs.readFile(wasm_url))
+            .then((bytes) => WebAssembly.instantiate(bytes, go.importObject));
+    } else if ("instantiateStreaming" in WebAssembly) {
+        inst = WebAssembly.instantiateStreaming(
+            fetch(wasm_url),
+            go.importObject
+        );
+    } else {
+        inst = fetch(wasm_url)
+            .then((response) => response.arrayBuffer())
+            .then((bytes) => WebAssembly.instantiate(bytes, go.importObject));
+    }
+    inst = (await inst).instance;
     go.run(inst);
+}
 
-    const input_len = go.storeString(input);
-    const output_len = inst.exports.format(input_len);
-    if (output_len < 0) {
-        throw new Error(go.loadString(-output_len));
+export function format(input) {
+    const [err, result] = inst.format(input);
+    if (err) {
+        throw new Error(result);
     }
 
-    return go.loadString(output_len);
+    return result;
 }

package/package.json

@@ -1,40 +1,50 @@
 {
-  "name": "@wasm-fmt/gofmt",
-  "author": "magic-akari <akari.ccino@gamil.com>",
-  "version": "0.3.0",
-  "description": "wasm based gofmt",
-  "main": "lib.js",
-  "types": "lib.d.ts",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./lib.d.ts",
-      "default": "./lib.js"
+    "name": "@wasm-fmt/gofmt",
+    "description": "A wasm based golang formatter",
+    "author": "magic-akari <akari.ccino@gamil.com>",
+    "version": "0.3.3",
+    "license": "MIT",
+    "keywords": [
+        "wasm",
+        "golang",
+        "formatter"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/wasm-fmt/gofmt"
     },
-    "./vite": {
-      "types": "./lib.d.ts",
-      "default": "./vite.js"
+    "homepage": "https://github.com/wasm-fmt/gofmt",
+    "bugs": {
+        "url": "https://github.com/wasm-fmt/gofmt/issues"
     },
-    "./package.json": "./package.json",
-    "./*": "./*"
-  },
-  "scripts": {
-    "go_wasm": "cp $(tinygo env TINYGOROOT)/targets/wasm_exec.js ./go_wasm.js",
-    "patch": "git apply ./go_wasm.patch",
-    "build": "tinygo build -o=lib.wasm -target=wasm -no-debug -stack-size=24kb ./src/lib.go",
-    "postbuild": "npm run go_wasm && npm run patch",
-    "test": "node --test"
-  },
-  "engines": {
-    "node": ">=16.17.0"
-  },
-  "keywords": [
-    "wasm",
-    "golang",
-    "formatter"
-  ],
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  }
+    "type": "module",
+    "main": "lib.js",
+    "module": "lib.js",
+    "types": "lib.d.ts",
+    "exports": {
+        ".": {
+            "types": "./lib.d.ts",
+            "default": "./lib.js"
+        },
+        "./vite": {
+            "types": "./lib.d.ts",
+            "default": "./vite.js"
+        },
+        "./package.json": "./package.json",
+        "./*": "./*"
+    },
+    "scripts": {
+        "go_wasm": "cp $(tinygo env TINYGOROOT)/targets/wasm_exec.js ./go_wasm.js",
+        "patch": "git apply ./go_wasm.patch",
+        "build": "tinygo build -o=lib.wasm -target=wasm -no-debug -stack-size=24kb ./src/lib.go",
+        "postbuild": "npm run go_wasm && npm run patch",
+        "test": "node --test"
+    },
+    "engines": {
+        "node": ">=16.17.0"
+    },
+    "publishConfig": {
+        "access": "public",
+        "provenance": true
+    }
 }

package/src/lib.go

@@ -1,31 +1,23 @@
 package main
 
-import "go/format"
+import (
+	"go/format"
+	"syscall/js"
+)
 
-const buf_len = 8192
+func Format(this js.Value, args []js.Value) any {
+	input := ([]byte)(args[0].String())
 
-var buf [buf_len]byte
-
-//go:export getBuffer
-func GetBuffer() *byte {
-	return &buf[0]
-}
-
-//go:export format
-func Format(input_len uint) int {
-	input := buf[:input_len]
 	output, err := format.Source(input)
 	if err != nil {
-		return -copy(buf[:], []byte(err.Error()))
+		return []any{true, err.Error()}
 	}
-	result := len(output)
 
-	if result > buf_len {
-		return -copy(buf[:], []byte("Buffer out of memory"))
-	}
-
-	copy(buf[:], output)
-	return result
+	return []any{false, string(output)}
 }
 
-func main() {}
+func main() {
+	done := make(chan bool)
+	js.Global().Set("format", js.FuncOf(Format))
+	<-done
+}