@wasm-fmt/gofmt 0.2.0 → 0.3.0

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/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

@@ -3,37 +3,42 @@ const go = new Go();
 
 let mod;
 
-export async function format(input, wasm_url) {
-  if (!mod) {
-    if (!wasm_url) {
-      wasm_url = new URL("lib.wasm", import.meta.url);
-    }
+export default async function init(wasm_url) {
+    if (!mod) {
+        if (!wasm_url) {
+            wasm_url = new URL("lib.wasm", import.meta.url);
+        }
 
-    if (typeof wasm_url === "string") {
-      wasm_url = new URL(wasm_url);
-    }
+        if (typeof wasm_url === "string") {
+            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));
-    } else {
-      const response = await fetch(wasm_url);
-      const bytes = await response.arrayBuffer();
-      mod = new WebAssembly.Module(bytes);
+        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);
+        }
     }
-  }
+}
 
-  const inst = new WebAssembly.Instance(mod, go.importObject);
-  go.run(inst);
+export function format(input) {
+    const inst = new WebAssembly.Instance(mod, go.importObject);
+    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));
-  }
+    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));
+    }
 
-  return go.loadString(output_len);
+    return go.loadString(output_len);
 }

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.0",
   "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/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";