@wasm-fmt/dart_fmt 0.3.0 → 0.4.0

package/dart_fmt_esm.js

@@ -0,0 +1,10 @@
+/* @ts-self-types="./dart_fmt.d.ts" */
+// prettier-ignore
+import source wasmModule from "./dart_fmt.wasm";
+import { formatWrapper, initSync } from "./dart_fmt.mjs";
+
+const app = initSync(wasmModule);
+
+export function format(source, filename, options) {
+	return formatWrapper(app, source, filename, options);
+}

package/dart_fmt_node.js

@@ -1,10 +1,13 @@
-import fs from "node:fs/promises";
-import initAsync from "./dart_fmt.js";
+/* @ts-self-types="./dart_fmt.d.ts" */
+import { readFileSync } from "node:fs";
+import { formatWrapper, initSync } from "./dart_fmt.mjs";
 
-const wasm = new URL("./dart_fmt.wasm", import.meta.url);
+const wasmUrl = new URL("dart_fmt.wasm", import.meta.url);
+const wasmBytes = readFileSync(wasmUrl);
+const wasmModule = new WebAssembly.Module(wasmBytes);
 
-export default function __wbg_init(init = fs.readFile(wasm)) {
-	return initAsync(init);
-}
+const app = initSync(wasmModule);
 
-export * from "./dart_fmt.js";
+export function format(source, filename, options) {
+	return formatWrapper(app, source, filename, options);
+}

package/dart_fmt_vite.js

@@ -1,7 +1,9 @@
-import initAsync from "./dart_fmt.js";
+/* @ts-self-types="./dart_fmt_web.d.ts" */
+
 import wasm from "./dart_fmt.wasm?url";
+import initAsync from "./dart_fmt_web.js";
 
-export default function __wbg_init(input = wasm) {
+export default function (input = wasm) {
 	return initAsync(input);
 }
 

package/dart_fmt_web.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Import this module and call init function before using.
+ *
+ * @example
+ * ```ts
+ * import init, { format } from "@wasm-fmt/dart_fmt/web";
+ *
+ * await init();
+ *
+ * const input = "void main() { print('Hello, World!'); }";
+ * const output = format(input, "main.dart");
+ * ```
+ *
+ * @module
+ */
+
+/**
+ * Input types for asynchronous WASM initialization.
+ * Can be a URL/path to fetch, a Response object, raw bytes, or a pre-compiled WebAssembly.Module.
+ */
+export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
+
+/**
+ * Input types for synchronous WASM initialization.
+ * Must be raw bytes (BufferSource) or a pre-compiled WebAssembly.Module.
+ */
+export type SyncInitInput = BufferSource | WebAssembly.Module;
+
+/**
+ * Initializes the WASM module asynchronously.
+ * @param init_input - Optional URL/path to the WASM file, or any valid InitInput
+ */
+export default function initAsync(init_input?: InitInput | Promise<InitInput>): Promise<void>;
+
+/**
+ * Initializes the WASM module synchronously.
+ * @param module_or_buffer - The WASM module or buffer source
+ */
+export declare function initSync(module_or_buffer: SyncInitInput): void;
+
+export * from "./dart_fmt.d.ts";

package/dart_fmt_web.js

@@ -0,0 +1,75 @@
+/* @ts-self-types="./dart_fmt_web.d.ts" */
+let app, wasmModule;
+import { formatWrapper, initSync as finalize_init } from "./dart_fmt.mjs";
+
+async function load(input) {
+	if (typeof Response === "function" && input instanceof Response) {
+		if (typeof WebAssembly.compileStreaming === "function") {
+			try {
+				return await WebAssembly.compileStreaming(input, compileOptions);
+			} catch (e) {
+				const validResponse = input.ok && expectedResponseType(input.type);
+
+				if (validResponse && input.headers.get("Content-Type") !== "application/wasm") {
+					console.warn(
+						"`WebAssembly.compileStreaming` 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 input.arrayBuffer();
+		return await WebAssembly.compile(bytes, compileOptions);
+	} else {
+		return await WebAssembly.compile(input, compileOptions);
+	}
+
+	function expectedResponseType(type) {
+		switch (type) {
+			case "basic":
+			case "cors":
+			case "default":
+				return true;
+		}
+		return false;
+	}
+}
+
+export function initSync(module_or_buffer) {
+	if (app !== void 0) return app;
+
+	if (!(module_or_buffer instanceof WebAssembly.Module)) {
+		module_or_buffer = new WebAssembly.Module(module_or_buffer, compileOptions);
+	}
+
+	return (app = finalize_init(module_or_buffer, compileOptions));
+}
+
+export default async function initAsync(init_input) {
+	if (app !== void 0) return app;
+
+	if (init_input === void 0) {
+		init_input = new URL("dart_fmt.wasm", import.meta.url);
+	}
+
+	if (
+		typeof init_input === "string" ||
+		(typeof Request === "function" && init_input instanceof Request) ||
+		(typeof URL === "function" && init_input instanceof URL)
+	) {
+		init_input = fetch(init_input);
+	}
+
+	const module = await load(await init_input);
+
+	return (app = finalize_init(module, compileOptions));
+}
+
+export function format(source, filename, options) {
+	return formatWrapper(app, source, filename, options);
+}
+
+const compileOptions = { builtins: ["js-string"] };

package/jsr.jsonc

@@ -1,30 +1,19 @@
 {
-    "name": "@fmt/dart-fmt",
-    "description": "Dart Formatter powered by WASM ported from dart_style",
-    "author": "magic-akari <akari.ccino@gmail.com>",
-    "version": "0.3.0",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/wasm-fmt/dart_fmt"
-    },
-    "module": "dart_fmt.js",
-    "homepage": "https://github.com/wasm-fmt/dart_fmt",
-    "types": "dart_fmt.d.ts",
-    "keywords": [
-        "wasm",
-        "formatter",
-        "dart"
-    ],
-    "main": "dart_fmt.js",
-    "type": "module",
-    "publishConfig": {
-        "access": "public"
-    },
-    "exports": "./dart_fmt.js",
-    "exclude": [
-        "!../build",
-        "*.tgz",
-        ".npmignore"
-    ]
-}
+	"$schema": "https://jsr.io/schema/config-file.v1.json",
+	"name": "@fmt/dart-fmt",
+	"version": "0.4.0",
+	"exports": {
+		"./node": "./dart_fmt_node.js",
+		"./web": "./dart_fmt_web.js"
+	},
+	"publish": {
+		"include": [
+			"dart_fmt_*",
+			"dart_fmt.*",
+			"*.md"
+		],
+		"exclude": [
+			"!*"
+		]
+	}
+}

package/package.json

@@ -1,37 +1,62 @@
 {
-    "name": "@wasm-fmt/dart_fmt",
-    "description": "Dart Formatter powered by WASM ported from dart_style",
-    "author": "magic-akari <akari.ccino@gmail.com>",
-    "version": "0.3.0",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/wasm-fmt/dart_fmt"
-    },
-    "module": "dart_fmt.js",
-    "homepage": "https://github.com/wasm-fmt/dart_fmt",
-    "types": "dart_fmt.d.ts",
-    "keywords": [
-        "wasm",
-        "formatter",
-        "dart"
-    ],
-    "main": "dart_fmt.js",
-    "type": "module",
-    "publishConfig": {
-        "access": "public"
-    },
-    "exports": {
-        ".": {
-            "types": "./dart_fmt.d.ts",
-            "node": "./dart_fmt_node.js",
-            "default": "./dart_fmt.js"
-        },
-        "./vite": {
-            "types": "./dart_fmt.d.ts",
-            "default": "./dart_fmt_vite.js"
-        },
-        "./package.json": "./package.json",
-        "./*": "./*"
-    }
+	"name": "@wasm-fmt/dart_fmt",
+	"description": "Dart Formatter powered by WASM ported from dart_style",
+	"author": "magic-akari <akari.ccino@gmail.com>",
+	"version": "0.4.0",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/wasm-fmt/dart_fmt.git"
+	},
+	"homepage": "https://github.com/wasm-fmt/dart_fmt",
+	"keywords": [
+		"wasm",
+		"formatter",
+		"dart"
+	],
+	"type": "module",
+	"scripts": {
+		"build": "scripts/build.sh",
+		"fmt:dart": "dart format .",
+		"fmt:dprint": "dprint fmt",
+		"test:node": "node --test test_node/*.mjs",
+		"test:deno": "deno test test_deno --allow-read",
+		"test:bun": "bun test test_bun",
+		"version": "node ./scripts/sync_version.js && git add ."
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"sideEffects": [
+		"./dart_fmt_node.js",
+		"./dart_fmt_esm.js"
+	],
+	"exports": {
+		".": {
+			"types": "./dart_fmt.d.ts",
+			"bun": "./dart_fmt_node.js",
+			"module-sync": "./dart_fmt_node.js",
+			"node": "./dart_fmt_node.js",
+			"default": "./dart_fmt_esm.js"
+		},
+		"./esm": {
+			"types": "./dart_fmt.d.ts",
+			"default": "./dart_fmt_esm.js"
+		},
+		"./node": {
+			"types": "./dart_fmt.d.ts",
+			"default": "./dart_fmt_node.js"
+		},
+		"./web": {
+			"types": "./dart_fmt_web.d.ts",
+			"default": "./dart_fmt_web.js"
+		},
+		"./vite": {
+			"types": "./dart_fmt_web.d.ts",
+			"default": "./dart_fmt_vite.js"
+		},
+		"./wasm": "./dart_fmt.wasm",
+		"./package.json": "./package.json",
+		"./*": "./*"
+	}
 }

package/dart_fmt.js

@@ -1,77 +0,0 @@
-/* @ts-self-types="./dart_fmt.d.ts" */
-import { format as dart_fmt, instantiate, invoke } from "./dart_fmt.mjs";
-
-let wasm;
-
-function normalize(module) {
-	if (!(module instanceof WebAssembly.Module)) {
-		return new WebAssembly.Module(module);
-	}
-	return module;
-}
-
-export default async function (input) {
-	if (wasm !== undefined) return wasm;
-
-	if (typeof input === "undefined") {
-		input = new URL("dart_fmt.wasm", import.meta.url);
-	}
-
-	if (
-		typeof input === "string" ||
-		(typeof Request === "function" && input instanceof Request) ||
-		(typeof URL === "function" && input instanceof URL)
-	) {
-		input = fetch(input);
-	}
-
-	wasm = await load(await input)
-		.then(normalize)
-		.then(instantiate);
-
-	invoke(wasm);
-
-	return wasm;
-}
-
-async function load(module) {
-	if (typeof Response === "function" && module instanceof Response) {
-		if ("compileStreaming" in WebAssembly) {
-			try {
-				return await WebAssembly.compileStreaming(module);
-			} catch (e) {
-				if (module.headers.get("Content-Type") != "application/wasm") {
-					console.warn(
-						"`WebAssembly.compileStreaming` 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;
-				}
-			}
-		}
-
-		return module.arrayBuffer();
-	}
-
-	return module;
-}
-
-export function format(source, filename = "stdin.dart", config = {}) {
-	const options = { lineEnding: "\n" };
-	if (config.line_width) {
-		options.pageWidth = config.line_width;
-	}
-	if (config.line_ending === "crlf") {
-		options.lineEnding = "\r\n";
-	}
-	if (config.language_version) {
-		options.languageVersion = config.language_version;
-	}
-
-	const result = dart_fmt(source, filename, JSON.stringify(options));
-	if (result.success) {
-		return result.code;
-	}
-	throw new Error(result.error);
-}