@wasm-fmt/gofmt 0.3.1 → 0.4.0

package/lib.d.ts

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

package/lib.js

@@ -1,44 +1,72 @@
 import { Go } from "./go_wasm.js";
 const go = new Go();
 
-let inst;
+let wasm;
 
-export default async function init(wasm_url) {
-    if (inst) {
-        return await inst;
+export default async function init(input) {
+    if (wasm) {
+        await wasm;
+        return;
     }
 
-    if (!wasm_url) {
-        wasm_url = new URL("lib.wasm", import.meta.url);
+    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 (typeof wasm_url === "string") {
-        wasm_url = new URL(wasm_url);
+    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 (
-        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));
+    if (instance instanceof WebAssembly.Instance) {
+        return { instance, module };
     }
-    inst = (await inst).instance;
-    go.run(inst);
+
+    return instance;
 }
 
 export function format(input) {
-    const [err, result] = inst.format(input);
+    const [err, result] = wasm.instance.format(input);
     if (err) {
         throw new Error(result);
     }

package/package.json

@@ -1,40 +1,50 @@
 {
-  "name": "@wasm-fmt/gofmt",
-  "author": "magic-akari <akari.ccino@gamil.com>",
-  "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"
+    "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"
     },
-    "./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/vite.js

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