@wasm-fmt/gofmt 0.4.6 → 0.4.8

package/README.md

@@ -1,16 +1,23 @@
 [![Test](https://github.com/wasm-fmt/gofmt/actions/workflows/test.yml/badge.svg)](https://github.com/wasm-fmt/gofmt/actions/workflows/test.yml)
-[![npm](https://img.shields.io/npm/v/@wasm-fmt/gofmt)](https://www.npmjs.com/package/@wasm-fmt/gofmt)
 
 # Install
 
+[![npm](https://img.shields.io/npm/v/@wasm-fmt/gofmt)](https://www.npmjs.com/package/@wasm-fmt/gofmt)
+
 ```bash
 npm install @wasm-fmt/gofmt
 ```
 
+[![jsr.io](https://jsr.io/badges/@fmt/gofmt)](https://jsr.io/@fmt/gofmt)
+
+```bash
+npx jsr add @fmt/gofmt
+```
+
 # Usage
 
 ```JavaScript
-import init, { format } from '@wasm-fmt/gofmt';
+import init, { format } from "@wasm-fmt/gofmt";
 
 await init();
 
@@ -28,7 +35,7 @@ console.log(formatted);
 Vite users tip:
 
 ```JavaScript
-import init, { format } from '@wasm-fmt/gofmt/vite';
+import init, { format } from "@wasm-fmt/gofmt/vite";
 ```
 
 # Build from source

package/gofmt.d.ts

@@ -5,5 +5,6 @@ export type InitInput =
 	| BufferSource
 	| WebAssembly.Module;
 
-export default function init(wasm_url?: InitInput): Promise<void>;
+export default function initAsync(wasm_url?: InitInput): Promise<void>;
+export declare function initSync(module: BufferSource | WebAssembly.Module): void;
 export declare function format(input: string): string;

package/gofmt.js

@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 //
 // This file has been modified for use by the TinyGo compiler.
+
 	const encoder = new TextEncoder("utf-8");
 	const decoder = new TextDecoder("utf-8");
 	let reinterpretBuf = new DataView(new ArrayBuffer(8));
@@ -114,7 +115,7 @@
 			this.importObject = {
 				wasi_snapshot_preview1: {
 					// https://github.com/WebAssembly/WASI/blob/main/phases/snapshot/docs.md#fd_write
-					fd_write() {},
+					fd_write: () => 0,      // dummy
 				},
 				gojs: {
 					// func ticks() float64
@@ -283,69 +284,69 @@
 			};
 		}
 	}
+
 /**
  * ================== End of wasm_exec.js ==================
  */
 /**/let wasm;
-/**/export default async function init(input) {
-/**/	if (wasm) {
-/**/		await wasm;
-/**/		return;
-/**/	}
-/**/	const go = new Go();
-/**/	wasm = load(input, go.importObject);
-/**/	wasm = await wasm;
-/**/	go.run(wasm.instance);
-/**/}
-/**/
-/**/async function load(module, importObject) {
-/**/	switch (typeof module) {
-/**/		case "undefined":
-/**/			module = "gofmt.wasm";
-/**/		case "string":
-/**/			module = new URL(module, import.meta.url);
-/**/	}
-/**/	if (module instanceof URL || module instanceof Request) {
-/**/		if (
-/**/			typeof __webpack_require__ !== "function" &&
-/**/			module.protocol === "file:"
-/**/		) {
-/**/			const fs = await import("node:fs/promises");
-/**/			module = await fs.readFile(module);
-/**/		} else {
-/**/			module = await fetch(module);
-/**/		}
-/**/	}
+/**/async function __load(module, imports) {
 /**/	if (typeof Response === 'function' && module instanceof Response) {
-/**/		if ("instantiateStreaming" in WebAssembly) {
-/**/			try {
-/**/				return await WebAssembly.instantiateStreaming(
-/**/					module,
-/**/					importObject
-/**/				);
-/**/			} catch (e) {
-/**/				if (module.headers.get("Content-Type") != "application/wasm") {
-/**/					console.warn(
-/**/						"`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n",
-/**/						e
-/**/					);
-/**/				} else {
-/**/					throw e;
-/**/				}
+/**/		if (typeof WebAssembly.instantiateStreaming === 'function') {
+/**/			try { return await WebAssembly.instantiateStreaming(module, imports); }
+/**/			catch (e) {
+/**/				if (module.headers.get('Content-Type') != 'application/wasm') {
+/**/					console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+/**/				} else { throw e; }
 /**/			}
 /**/		}
 /**/		const bytes = await module.arrayBuffer();
-/**/		return await WebAssembly.instantiate(bytes, importObject);
-/**/	}
-/**/	const instance = await WebAssembly.instantiate(module, importObject);
-/**/	if (instance instanceof WebAssembly.Instance) {
-/**/		return { instance, module };
+/**/		return await WebAssembly.instantiate(bytes, imports);
+/**/	} else {
+/**/		const instance = await WebAssembly.instantiate(module, imports);
+/**/		if (instance instanceof WebAssembly.Instance) return { instance, module };
+/**/		else return instance;
 /**/	}
-/**/	return instance;
 /**/}
+/**/function __finalize_init(instance) {
+/**/	return wasm = instance;
+/**/}
+/**/function __init_memory(imports, maybe_memory) { }
+/**/export function initSync(module) {
+/**/	if (wasm !== undefined) return wasm;
+/**/
+/**/	const go = new Go;
+/**/	const imports = go.importObject;
+/**/
+/**/	__init_memory(imports);
 /**/
+/**/	if (!(module instanceof WebAssembly.Module)) module = new WebAssembly.Module(module);
+/**/
+/**/	const instance = new WebAssembly.Instance(module, imports);
+/**/
+/**/	go.run(instance);
+/**/	return __finalize_init(instance, module);
+/**/}
+/**/export default async function initAsync(input) {
+/**/	if (wasm !== undefined) return wasm;
+/**/
+/**/	if (typeof input === 'undefined') input = new URL('gofmt.wasm', import.meta.url);
+/**/
+/**/	const go = new Go;
+/**/	const imports = go.importObject;
+/**/
+/**/	if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
+/**/		input = fetch(input);
+/**/	}
+/**/
+/**/	__init_memory(imports);
+/**/
+/**/	const { instance, module } = await __load(await input, imports);
+/**/
+/**/	go.run(instance);
+/**/	return __finalize_init(instance, module);
+/**/}
 /**/export function format(input) {
-/**/	const [err, result] = wasm.instance.format(input);
+/**/	const [err, result] = wasm.format(input);
 /**/	if (err) {
 /**/		throw new Error(result);
 /**/	}

package/gofmt_node.js

@@ -0,0 +1,10 @@
+import fs from "node:fs/promises";
+import initAsync from "./gofmt.js";
+
+const wasm = new URL("./gofmt.wasm", import.meta.url);
+
+export default function (init = fs.readFile(wasm)) {
+	return initAsync(init);
+}
+
+export * from "./gofmt.js";

package/{vite.js → gofmt_vite.js}

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

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@wasm-fmt/gofmt",
 	"description": "A wasm based golang formatter",
 	"author": "magic-akari <akari.ccino@gamil.com>",
-	"version": "0.4.6",
+	"version": "0.4.8",
 	"license": "MIT",
 	"keywords": [
 		"wasm",
@@ -24,11 +24,12 @@
 	"exports": {
 		".": {
 			"types": "./gofmt.d.ts",
+			"node": "./gofmt_node.js",
 			"default": "./gofmt.js"
 		},
 		"./vite": {
 			"types": "./gofmt.d.ts",
-			"default": "./vite.js"
+			"default": "./gofmt_vite.js"
 		},
 		"./package.json": "./package.json",
 		"./*": "./*"

package/go.mod

@@ -1,3 +0,0 @@
-module github.com/wasm-fmt/gofmt
-
-go 1.20