md4x 0.0.12 → 0.0.16

package/lib/wasm/common.mjs

@@ -0,0 +1,87 @@
+// --- internal ---
+
+let _instance;
+
+export function _hasInstance() {
+  return !!_instance;
+}
+
+export function _setInstance(instance) {
+  _instance = instance;
+}
+
+export function _getExports() {
+  if (!_instance?.exports) {
+    throw new Error("md4x: WASM not initialized. Call `await init()` first.", {
+      cause: { instance: _instance },
+    });
+  }
+  return _instance.exports;
+}
+
+export const _imports = {
+  wasi_snapshot_preview1: {
+    fd_close: () => 0,
+    fd_seek: () => 0,
+    fd_write: () => 0,
+    proc_exit: () => {},
+  },
+};
+
+function render(exports, fn, input, ...extra) {
+  const { memory, md4x_alloc, md4x_free, md4x_result_ptr, md4x_result_size } =
+    exports;
+  const encoded = new TextEncoder().encode(input);
+  const ptr = md4x_alloc(encoded.length);
+  new Uint8Array(memory.buffer).set(encoded, ptr);
+  const ret = fn(ptr, encoded.length, ...extra);
+  md4x_free(ptr);
+  if (ret !== 0) {
+    throw new Error("md4x: render failed");
+  }
+  const outPtr = md4x_result_ptr();
+  const outSize = md4x_result_size();
+  const result = new TextDecoder().decode(
+    new Uint8Array(memory.buffer, outPtr, outSize),
+  );
+  md4x_free(outPtr);
+  return result;
+}
+
+export function renderToHtml(input, opts) {
+  const flags = opts?.full ? 0x0008 : 0;
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_html, input, flags);
+}
+
+export function renderToAST(input) {
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_ast, input);
+}
+
+export function parseAST(input) {
+  return JSON.parse(renderToAST(input));
+}
+
+export function renderToAnsi(input) {
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_ansi, input);
+}
+
+export function renderToMeta(input) {
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_meta, input);
+}
+
+export function renderToText(input) {
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_text, input);
+}
+
+export function parseMeta(input) {
+  const meta = JSON.parse(renderToMeta(input));
+  if (!meta.title && meta.headings?.[0]) {
+    meta.title = meta.headings[0].text;
+  }
+  return meta;
+}

package/lib/wasm/defult.mjs

@@ -0,0 +1,50 @@
+export {
+  renderToHtml,
+  renderToAST,
+  parseAST,
+  renderToAnsi,
+  parseMeta,
+  renderToMeta,
+  renderToText,
+} from "./common.mjs";
+
+import { _setInstance, _imports, _hasInstance } from "./common.mjs";
+
+export async function init(opts) {
+  if (_hasInstance()) {
+    return;
+  }
+  const input = opts?.wasm;
+  let bytes;
+  if (input instanceof ArrayBuffer || input instanceof Uint8Array) {
+    bytes = input;
+  } else if (input instanceof WebAssembly.Module) {
+    const { instance } = await WebAssembly.instantiate(input, {
+      wasi_snapshot_preview1: wasiStub,
+    });
+    _setInstance(instance);
+    return;
+  } else if (
+    input instanceof Response ||
+    (typeof input === "object" && typeof input.then === "function")
+  ) {
+    const response = await input;
+    if (response instanceof Response) {
+      bytes = await response.arrayBuffer();
+    } else {
+      bytes = response;
+    }
+  } else {
+    const fsp = globalThis.process?.getBuiltinModule?.("fs/promises");
+    if (fsp) {
+      const wasmPath = new URL("../../build/md4x.wasm", import.meta.url);
+      bytes = await fsp.readFile(wasmPath);
+    } else {
+      bytes = await fetch(
+        await import("../../build/md4x.wasm?url").then((m) => m.default),
+      ).then((r) => r.arrayBuffer());
+    }
+  }
+  const { instance } = await WebAssembly.instantiate(bytes, _imports);
+  _setInstance(instance);
+}

package/lib/wasm/unwasm.mjs

@@ -0,0 +1,22 @@
+export {
+  renderToHtml,
+  renderToAST,
+  parseAST,
+  renderToAnsi,
+  parseMeta,
+  renderToMeta,
+  renderToText,
+} from "./common.mjs";
+
+import { _setInstance, _hasInstance, _imports } from "./common.mjs";
+
+export async function init() {
+  if (_hasInstance()) {
+    return;
+  }
+  let { default: instance } = await import("md4x/build/md4x.wasm?module");
+  if (instance instanceof WebAssembly.Module) {
+    instance = await WebAssembly.instantiate(instance, _imports);
+  }
+  _setInstance(instance);
+}

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "md4x",
-  "version": "0.0.12",
+  "version": "0.0.16",
   "repository": "pi0/md4x",
   "license": "MIT",
   "type": "module",
   "exports": {
     "./wasm": {
-      "unwasm": "./lib/unwasm.mjs",
-      "default": "./lib/wasm.mjs"
+      "unwasm": "./lib/wasm/unwasm.mjs",
+      "default": "./lib/wasm/defult.mjs"
     },
     "./napi": "./lib/napi.mjs",
     "./build/md4x.wasm": "./build/md4x.wasm",
     ".": {
       "node": "./lib/napi.mjs",
-      "default": "./lib/wasm.mjs"
+      "default": {
+        "unwasm": "./lib/wasm/unwasm.mjs",
+        "default": "./lib/wasm/defult.mjs"
+      }
     }
   },
   "types": "./lib/types.d.mts",

package/lib/unwasm.mjs

@@ -1,19 +0,0 @@
-import { init as _init } from "./wasm.mjs";
-
-export {
-  renderToHtml,
-  renderToAST,
-  parseAST,
-  renderToAnsi,
-  parseMeta,
-  renderToMeta,
-  renderToText,
-} from "./wasm.mjs";
-
-export async function init(opts) {
-  if (opts?.wasm) {
-    return _init(opts);
-  }
-  const mod = await import("md4x/build/md4x.wasm?module");
-  return _init({ wasm: mod.default });
-}

package/lib/wasm.mjs

@@ -1,111 +0,0 @@
-// --- internal ---
-
-let _instance;
-
-function getExports() {
-  if (!_instance) {
-    throw new Error("md4x: WASM not initialized. Call `await init()` first.");
-  }
-  return _instance.exports;
-}
-
-const wasiStub = {
-  fd_close: () => 0,
-  fd_seek: () => 0,
-  fd_write: () => 0,
-  proc_exit: () => {},
-};
-
-function render(exports, fn, input, ...extra) {
-  const { memory, md4x_alloc, md4x_free, md4x_result_ptr, md4x_result_size } =
-    exports;
-  const encoded = new TextEncoder().encode(input);
-  const ptr = md4x_alloc(encoded.length);
-  new Uint8Array(memory.buffer).set(encoded, ptr);
-  const ret = fn(ptr, encoded.length, ...extra);
-  md4x_free(ptr);
-  if (ret !== 0) {
-    throw new Error("md4x: render failed");
-  }
-  const outPtr = md4x_result_ptr();
-  const outSize = md4x_result_size();
-  const result = new TextDecoder().decode(
-    new Uint8Array(memory.buffer, outPtr, outSize),
-  );
-  md4x_free(outPtr);
-  return result;
-}
-
-// --- exports ----
-
-export async function init(opts) {
-  if (_instance) return;
-  const input = opts?.wasm;
-  let bytes;
-  if (input instanceof ArrayBuffer || input instanceof Uint8Array) {
-    bytes = input;
-  } else if (input instanceof WebAssembly.Module) {
-    const { instance } = await WebAssembly.instantiate(input, {
-      wasi_snapshot_preview1: wasiStub,
-    });
-    _instance = instance;
-    return;
-  } else if (
-    input instanceof Response ||
-    (typeof input === "object" && typeof input.then === "function")
-  ) {
-    const response = await input;
-    if (response instanceof Response) {
-      bytes = await response.arrayBuffer();
-    } else {
-      bytes = response;
-    }
-  } else {
-    const fsp = globalThis.process?.getBuiltinModule?.("fs/promises");
-    if (fsp) {
-      const wasmPath = new URL("../build/md4x.wasm", import.meta.url);
-      bytes = await fsp.readFile(wasmPath);
-    } else {
-      bytes = await fetch(
-        await import("../build/md4x.wasm?url").then((m) => m.default),
-      ).then((r) => r.arrayBuffer());
-    }
-  }
-  const { instance } = await WebAssembly.instantiate(bytes, {
-    wasi_snapshot_preview1: wasiStub,
-  });
-  _instance = instance;
-}
-
-export function renderToHtml(input, opts) {
-  const flags = opts?.full ? 0x0008 : 0;
-  return render(getExports(), getExports().md4x_to_html, input, flags);
-}
-
-export function renderToAST(input) {
-  return render(getExports(), getExports().md4x_to_ast, input);
-}
-
-export function parseAST(input) {
-  return JSON.parse(renderToAST(input));
-}
-
-export function renderToAnsi(input) {
-  return render(getExports(), getExports().md4x_to_ansi, input);
-}
-
-export function renderToMeta(input) {
-  return render(getExports(), getExports().md4x_to_meta, input);
-}
-
-export function renderToText(input) {
-  return render(getExports(), getExports().md4x_to_text, input);
-}
-
-export function parseMeta(input) {
-  const meta = JSON.parse(renderToMeta(input));
-  if (!meta.title && meta.headings?.[0]) {
-    meta.title = meta.headings[0].text;
-  }
-  return meta;
-}