@wasm-fmt/gofmt 0.2.0 → 0.3.1

package/.editorconfig

@@ -0,0 +1,11 @@
+# Check http://editorconfig.org for more information
+# This is the main config file for this project:
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+indent_size = 4

package/.gitattributes

@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+*.js linguist-detectable=false
+*.mjs linguist-detectable=false
+*.sh linguist-detectable=false

package/README.md

@@ -10,27 +10,25 @@ npm install @wasm-fmt/gofmt
 # Usage
 
 ```JavaScript
-import { format } from '@wasm-fmt/gofmt';
+import init, { format } from '@wasm-fmt/gofmt';
+
+await init();
 
 const source = `
 package main
 import "fmt"
-func main(){fmt.Println("Hello, 世界")}
+func main(){fmt.Println("Hello, 世界")
+}
 `;
 
-const formatted = await format(source);
+const formatted = format(source);
 console.log(formatted);
 ```
 
 Vite users tip:
 
 ```JavaScript
-import { format } from '@wasm-fmt/gofmt';
-import wasmUrl from "@wasm-fmt/gofmt/lib.wasm?url";
-
-// ...
-
-const formatted = await format(source, new URL(wasmUrl, import.meta.url));
+import init, { format } from '@wasm-fmt/gofmt/vite';
 ```
 
 # Build from source

package/gen_patch.sh

@@ -0,0 +1,23 @@
+current_dir=$(pwd)
+tmp_dir=$(mktemp -d)
+
+cd $tmp_dir
+git init
+
+cp $(tinygo env TINYGOROOT)/targets/wasm_exec.js $tmp_dir/go_wasm.js
+git add -f .
+git commit -m "init"
+
+cp $current_dir/go_wasm.js $tmp_dir/go_wasm.js
+git add -f .
+
+git diff \
+    --cached \
+    --no-color \
+    --ignore-space-at-eol \
+    --no-ext-diff \
+    --src-prefix=a/ \
+    --dst-prefix=b/ \
+    >$current_dir/go_wasm.patch
+
+rm -rf $tmp_dir

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.d.ts

@@ -1,4 +1,2 @@
-export declare function format(
-  input: string,
-  wasm_url?: string | URL
-): Promise<string>;
+export default function init(wasm_url?: string | URL): Promise<void>;
+export declare function format(input: string): string;

package/lib.js

@@ -1,39 +1,47 @@
 import { Go } from "./go_wasm.js";
 const go = new Go();
 
-let mod;
+let inst;
+
+export default async function init(wasm_url) {
+    if (inst) {
+        return await inst;
+    }
 
-export async function format(input, wasm_url) {
-  if (!mod) {
     if (!wasm_url) {
-      wasm_url = new URL("lib.wasm", import.meta.url);
+        wasm_url = new URL("lib.wasm", import.meta.url);
     }
 
     if (typeof wasm_url === "string") {
-      wasm_url = new URL(wasm_url);
+        wasm_url = new URL(wasm_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));
+    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 {
-      const response = await fetch(wasm_url);
-      const bytes = await response.arrayBuffer();
-      mod = new WebAssembly.Module(bytes);
+        inst = fetch(wasm_url)
+            .then((response) => response.arrayBuffer())
+            .then((bytes) => WebAssembly.instantiate(bytes, go.importObject));
     }
-  }
-
-  const inst = new WebAssembly.Instance(mod, go.importObject);
-  go.run(inst);
+    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,11 +1,23 @@
 {
   "name": "@wasm-fmt/gofmt",
   "author": "magic-akari <akari.ccino@gamil.com>",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "wasm based gofmt",
   "main": "lib.js",
   "types": "lib.d.ts",
   "type": "module",
+  "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",
@@ -16,7 +28,11 @@
   "engines": {
     "node": ">=16.17.0"
   },
-  "keywords": [],
+  "keywords": [
+    "wasm",
+    "golang",
+    "formatter"
+  ],
   "license": "MIT",
   "publishConfig": {
     "access": "public"

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
+}

package/test.js

@@ -1,31 +1,29 @@
-import assert from "node:assert";
+import assert from "node:assert/strict";
 import fs from "node:fs/promises";
 import test from "node:test";
-import { format } from "./lib.js";
+import init, { format } from "./lib.js";
+
+await init();
 
 const files = (await fs.readdir("testdata"))
-  .filter((f) => f.endsWith(".input"))
-  .map((f) => {
-    return {
-      input_name: f,
-      golden_name: f.replace(".input", ".golden"),
-    };
-  });
+    .filter((f) => f.endsWith(".input"))
+    .map((f) => {
+        return {
+            input_name: f,
+            golden_name: f.replace(".input", ".golden"),
+        };
+    });
 
 for (const { input_name, golden_name } of files) {
-  await test(
-    `format ${input_name}`,
-    { skip: input_name[0] === "." },
-    async () => {
-      const [input, expected] = await Promise.all(
-        [input_name, golden_name].map((f) =>
-          fs.readFile(`testdata/${f}`, "utf-8")
-        )
-      );
+    test(`format ${input_name}`, { skip: input_name[0] === "." }, async () => {
+        const [input, expected] = await Promise.all(
+            [input_name, golden_name].map((f) =>
+                fs.readFile(`testdata/${f}`, "utf-8")
+            )
+        );
 
-      const actual = await format(input);
+        const actual = format(input);
 
-      assert.strictEqual(actual, expected);
-    }
-  );
+        assert.equal(actual, expected);
+    });
 }

package/vite.js

@@ -0,0 +1,8 @@
+import init from "./lib.js";
+import wasm from "./lib.wasm?url";
+
+export default function __wbg_init(input = wasm) {
+    return init(input);
+}
+
+export * from "./lib.js";