@wasm-fmt/gofmt 0.4.0 → 0.4.2

package/README.md

@@ -1,4 +1,4 @@
-[![Build](https://github.com/wasm-fmt/gofmt/actions/workflows/build.yml/badge.svg)](https://github.com/wasm-fmt/gofmt/actions/workflows/build.yml)
+[![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
@@ -40,8 +40,8 @@ git clone https://github.com/wasm-fmt/gofmt.git
 # 2. install TinyGo https://tinygo.org/getting-started/install/
 
 # 3. build
-npm run build
+pnpm build
 
 # 4. test
-npm run test
+pnpm run /^test:/
 ```

package/{lib.d.ts → gofmt.d.ts}

@@ -1,9 +1,9 @@
 export type InitInput =
-    | RequestInfo
-    | URL
-    | Response
-    | BufferSource
-    | WebAssembly.Module;
+	| RequestInfo
+	| URL
+	| Response
+	| BufferSource
+	| WebAssembly.Module;
 
 export default function init(wasm_url?: InitInput): Promise<void>;
 export declare function format(input: string): string;

package/{go_wasm.js → gofmt.js}

@@ -3,11 +3,10 @@
 // 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");
 
-	export class Go {
+	class Go {
 		constructor() {
 			this._callbackTimeouts = new Map();
 			this._nextCallbackTimeoutID = 1;
@@ -356,3 +355,72 @@
 			};
 		}
 	}
+/**
+ * ================== 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);
+/**/		}
+/**/	}
+/**/	if (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;
+/**/				}
+/**/			}
+/**/		}
+/**/		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 instance;
+/**/}
+/**/
+/**/export function format(input) {
+/**/	const [err, result] = wasm.instance.format(input);
+/**/	if (err) {
+/**/		throw new Error(result);
+/**/	}
+/**/	return result;
+/**/}
+/**/

package/package.json

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

package/vite.js

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

package/.editorconfig

@@ -1,11 +0,0 @@
-# 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

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

package/.node-version

@@ -1 +0,0 @@
-v18.17.0

package/gen_patch.sh

@@ -1,23 +0,0 @@
-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/lib.js

@@ -1,75 +0,0 @@
-import { Go } from "./go_wasm.js";
-const go = new Go();
-
-let wasm;
-
-export default async function init(input) {
-    if (wasm) {
-        await wasm;
-        return;
-    }
-
-    wasm = load(input, go.importObject);
-    wasm = await wasm;
-    go.run(wasm.instance);
-}
-
-async function load(module, importObject) {
-    switch (typeof module) {
-        case "undefined":
-            module = "lib.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);
-        }
-    }
-
-    if (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;
-                }
-            }
-        }
-
-        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 instance;
-}
-
-export function format(input) {
-    const [err, result] = wasm.instance.format(input);
-    if (err) {
-        throw new Error(result);
-    }
-
-    return result;
-}

package/src/lib.go

@@ -1,23 +0,0 @@
-package main
-
-import (
-	"go/format"
-	"syscall/js"
-)
-
-func Format(this js.Value, args []js.Value) any {
-	input := ([]byte)(args[0].String())
-
-	output, err := format.Source(input)
-	if err != nil {
-		return []any{true, err.Error()}
-	}
-
-	return []any{false, string(output)}
-}
-
-func main() {
-	done := make(chan bool)
-	js.Global().Set("format", js.FuncOf(Format))
-	<-done
-}

package/test.js

@@ -1,29 +0,0 @@
-import assert from "node:assert/strict";
-import fs from "node:fs/promises";
-import test from "node:test";
-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"),
-        };
-    });
-
-for (const { input_name, golden_name } of files) {
-    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 = format(input);
-
-        assert.equal(actual, expected);
-    });
-}