unwasm 0.3.11 → 0.4.0

package/examples/add-esmi-deps.mjs

@@ -0,0 +1,3 @@
+export function getValue() {
+  return 41;
+}

package/examples/build.mjs

@@ -1,6 +1,11 @@
 import { fileURLToPath } from "node:url";
+import fs from 'node:fs/promises';
+import Module from "node:module";
 import { main as asc } from "assemblyscript/asc";
 
+const require = Module.createRequire(import.meta.url);
+const wabt = await require("wabt")();
+
 async function compile(name) {
   // https://www.assemblyscript.org/compiler.html#programmatic-usage
   const res = await asc([`${name}.asc.ts`, "-o", `${name}.wasm`], {});
@@ -14,7 +19,16 @@ async function compile(name) {
   }
 }
 
+async function compileWat(name) {
+  const module = wabt.parseWat(`${name}.wat`, await fs.readFile(`${name}.wat`));
+  module.resolveNames();
+  const binaryOutput = module.toBinary({write_debug_names:true});
+  const binaryBuffer = binaryOutput.buffer;
+  await fs.writeFile(`${name}.wasm`, binaryBuffer);
+}
+
 process.chdir(fileURLToPath(new URL(".", import.meta.url)));
 
 await compile("sum");
 await compile("rand");
+await compileWat("add-esmi");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unwasm",
-  "version": "0.3.11",
+  "version": "0.4.0",
   "description": "WebAssembly tools for JavaScript",
   "repository": "unjs/unwasm",
   "license": "MIT",
@@ -8,36 +8,17 @@
   "type": "module",
   "exports": {
     "./examples/*": "./examples/*",
-    "./plugin": {
-      "import": {
-        "types": "./dist/plugin.d.mts",
-        "default": "./dist/plugin.mjs"
-      },
-      "require": {
-        "types": "./dist/plugin.d.ts",
-        "default": "./dist/plugin.cjs"
-      }
-    },
-    "./tools": {
-      "import": {
-        "types": "./dist/tools.d.mts",
-        "default": "./dist/tools.mjs"
-      },
-      "require": {
-        "types": "./dist/tools.d.ts",
-        "default": "./dist/tools.cjs"
-      }
-    }
+    "./plugin": "./dist/plugin/index.mjs",
+    "./tools": "./dist/tools/index.mjs"
   },
   "files": [
     "dist",
-    "*.d.ts",
     "examples/*.wasm",
     "examples/package.json",
     "examples/*.mjs"
   ],
   "scripts": {
-    "build": "unbuild && pnpm build:examples",
+    "build": "obuild && pnpm build:examples",
     "build:examples": "node ./examples/build.mjs",
     "dev": "vitest dev",
     "lint": "eslint --cache . && prettier -c src test",
@@ -48,34 +29,35 @@
     "test:types": "tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
+    "exsolve": "^1.0.7",
     "knitwork": "^1.2.0",
-    "magic-string": "^0.30.17",
-    "mlly": "^1.7.4",
+    "magic-string": "^0.30.21",
+    "mlly": "^1.8.0",
     "pathe": "^2.0.3",
-    "pkg-types": "^2.2.0",
-    "unplugin": "^2.3.6"
+    "pkg-types": "^2.3.0"
   },
   "devDependencies": {
-    "@prisma/client": "^6.14.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@types/node": "^24.3.0",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@prisma/client": "^6.18.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@types/node": "^24.10.0",
+    "@vitest/coverage-v8": "^4.0.6",
     "@webassemblyjs/wasm-parser": "^1.14.1",
-    "assemblyscript": "^0.28.4",
-    "automd": "^0.4.0",
+    "assemblyscript": "^0.28.9",
+    "automd": "^0.4.2",
     "changelogen": "^0.6.2",
-    "esbuild": "^0.25.9",
-    "eslint": "^9.33.0",
+    "esbuild": "^0.25.12",
+    "eslint": "^9.39.1",
     "eslint-config-unjs": "^0.5.0",
     "exsolve": "^1.0.7",
-    "jiti": "^2.5.1",
-    "miniflare": "^4.20250813.1",
+    "jiti": "^2.6.1",
+    "miniflare": "^4.20251011.1",
+    "obuild": "^0.3.2",
     "prettier": "^3.6.2",
-    "rollup": "^4.46.3",
-    "typescript": "^5.9.2",
-    "unbuild": "^3.6.1",
-    "vite": "^7.1.2",
-    "vitest": "^3.2.4"
+    "rollup": "^4.52.5",
+    "typescript": "^5.9.3",
+    "vite": "^7.1.12",
+    "vitest": "^4.0.6",
+    "wabt": "^1.0.38"
   },
   "resolutions": {
     "@webassemblyjs/helper-wasm-bytecode": "1.14.1",
@@ -83,5 +65,5 @@
     "@webassemblyjs/leb128": "1.14.1",
     "@webassemblyjs/utf8": "1.14.1"
   },
-  "packageManager": "pnpm@10.14.0"
+  "packageManager": "pnpm@10.20.0"
 }

package/dist/plugin.cjs

@@ -1,377 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const node_fs = require('node:fs');
-const pathe = require('pathe');
-const MagicString = require('magic-string');
-const unplugin$1 = require('unplugin');
-const node_crypto = require('node:crypto');
-const knitwork = require('knitwork');
-const tools = require('./tools.cjs');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
-
-const UNWASM_EXTERNAL_PREFIX = "\0unwasm:external:";
-const UNWASM_EXTERNAL_RE = /(\0|\\0)unwasm:external:([^"']+)/gu;
-const UMWASM_HELPERS_ID = "\0unwasm:helpers";
-function sha1(source) {
-  return node_crypto.createHash("sha1").update(source).digest("hex").slice(0, 16);
-}
-
-async function getWasmImports(asset, _opts) {
-  const importNames = Object.keys(asset.imports || {});
-  if (importNames.length === 0) {
-    return {
-      code: "const _imports = { /* no imports */ }",
-      resolved: true
-    };
-  }
-  const { readPackageJSON } = await import('pkg-types');
-  const pkgJSON = await readPackageJSON(asset.id);
-  let resolved = true;
-  const imports = [];
-  const importsObject = {};
-  for (const moduleName of importNames) {
-    const importNames2 = asset.imports[moduleName];
-    const pkgImport = pkgJSON.imports?.[moduleName] || pkgJSON.imports?.[`#${moduleName}`];
-    const importName = "_imports_" + knitwork.genSafeVariableName(moduleName);
-    if (pkgImport && typeof pkgImport === "string") {
-      imports.push(knitwork.genImport(pkgImport, { name: "*", as: importName }));
-    } else {
-      resolved = false;
-    }
-    importsObject[moduleName] = Object.fromEntries(
-      importNames2.map((name) => [
-        name,
-        pkgImport ? `${importName}[${knitwork.genString(name)}]` : `() => { throw new Error(${knitwork.genString(moduleName + "." + importName)} + " is not provided!")}`
-      ])
-    );
-  }
-  const code = `${imports.join("\n")}
-
-const _imports = ${knitwork.genObjectFromRaw(importsObject)}`;
-  return {
-    code,
-    resolved
-  };
-}
-
-async function getWasmESMBinding(asset, opts) {
-  const autoImports = await getWasmImports(asset);
-  const instantiateCode = opts.esmImport ? getESMImportInstantiate(asset, autoImports.code) : getBase64Instantiate(asset, autoImports.code);
-  return opts.lazy !== true && autoImports.resolved ? getExports(asset, instantiateCode) : getLazyExports(asset, instantiateCode);
-}
-function getWasmModuleBinding(asset, opts) {
-  return opts.esmImport ? (
-    /* js */
-    `
-const _mod = ${opts.lazy === true ? "" : `await`} import("${UNWASM_EXTERNAL_PREFIX}${asset.name}").then(r => r.default || r);
-export default _mod;
-  `
-  ) : (
-    /* js */
-    `
-import { base64ToUint8Array } from "${UMWASM_HELPERS_ID}";
-const _data = base64ToUint8Array("${asset.source.toString("base64")}");
-const _mod = new WebAssembly.Module(_data);
-export default _mod;
-  `
-  );
-}
-function getESMImportInstantiate(asset, importsCode) {
-  return (
-    /* js */
-    `
-${importsCode}
-
-async function _instantiate(imports = _imports) {
-const _mod = await import("${UNWASM_EXTERNAL_PREFIX}${asset.name}").then(r => r.default || r);
-return WebAssembly.instantiate(_mod, imports)
-}
-  `
-  );
-}
-function getBase64Instantiate(asset, importsCode) {
-  return (
-    /* js */
-    `
-import { base64ToUint8Array } from "${UMWASM_HELPERS_ID}";
-
-${importsCode}
-
-function _instantiate(imports = _imports) {
-  const _data = base64ToUint8Array("${asset.source.toString("base64")}")
-  return WebAssembly.instantiate(_data, imports)  }
-  `
-  );
-}
-function getExports(asset, instantiateCode) {
-  return (
-    /* js */
-    `
-import { getExports } from "${UMWASM_HELPERS_ID}";
-
-${instantiateCode}
-
-const $exports = getExports(await _instantiate());
-
-${asset.exports.map((name) => `export const ${name} = $exports.${name};`).join("\n")}
-
-const defaultExport = () => $exports;
-${asset.exports.map((name) => `defaultExport["${name}"] = $exports.${name};`).join("\n")}
-export default defaultExport;
-      `
-  );
-}
-function getLazyExports(asset, instantiateCode) {
-  return (
-    /* js */
-    `
-import { createLazyWasmModule } from "${UMWASM_HELPERS_ID}";
-
-${instantiateCode}
-
-const _mod = createLazyWasmModule(_instantiate);
-
-${asset.exports.map((name) => `export const ${name} = _mod.${name};`).join("\n")}
-
-export default _mod;
-      `
-  );
-}
-
-function getPluginUtils() {
-  return (
-    /* js */
-    `
-export function debug(...args) {
-  console.log('[unwasm] [debug]', ...args);
-}
-
-export function getExports(input) {
-  return input?.instance?.exports || input?.exports || input;
-}
-
-export function base64ToUint8Array(str) {
-  const data = atob(str);
-  const size = data.length;
-  const bytes = new Uint8Array(size);
-  for (let i = 0; i < size; i++) {
-    bytes[i] = data.charCodeAt(i);
-  }
-  return bytes;
-}
-
-export function createLazyWasmModule(_instantiator) {
-  const _exports = Object.create(null);
-  let _loaded;
-  let _promise;
-
-  const init = (imports) => {
-    if (_loaded) {
-      return Promise.resolve(exportsProxy);
-    }
-    if (_promise) {
-      return _promise;
-    }
-    return _promise = _instantiator(imports)
-      .then(r => {
-        Object.assign(_exports, getExports(r));
-        _loaded = true;
-        _promise = undefined;
-        return exportsProxy;
-      })
-      .catch(error => {
-        _promise = undefined;
-        console.error('[wasm] [error]', error);
-        throw error;
-      });
-  }
-
-  const exportsProxy = new Proxy(_exports, {
-    get(_, prop) {
-      if (_loaded) {
-        return _exports[prop];
-      }
-      return (...args) => {
-        return _loaded
-          ? _exports[prop]?.(...args)
-          : init().then(() => _exports[prop]?.(...args));
-      };
-    },
-  });
-
-
-  const lazyProxy = new Proxy(() => {}, {
-    get(_, prop) {
-      return exportsProxy[prop];
-    },
-    apply(_, __, args) {
-      return init(args[0])
-    },
-  });
-
-  return lazyProxy;
-}
-  `
-  );
-}
-
-const WASM_ID_RE = /\.wasm\??.*$/i;
-const unplugin = unplugin$1.createUnplugin((opts) => {
-  const assets = /* @__PURE__ */ Object.create(null);
-  const _parseCache = /* @__PURE__ */ Object.create(null);
-  function parse(name, source) {
-    if (_parseCache[name]) {
-      return _parseCache[name];
-    }
-    const imports = /* @__PURE__ */ Object.create(null);
-    const exports = [];
-    try {
-      const parsed = tools.parseWasm(source, { name });
-      for (const mod of parsed.modules) {
-        exports.push(...mod.exports.map((e) => e.name));
-        for (const imp of mod.imports) {
-          if (!imports[imp.module]) {
-            imports[imp.module] = [];
-          }
-          imports[imp.module].push(imp.name);
-        }
-      }
-    } catch (error) {
-      console.warn(`[unwasm] Failed to parse WASM module ${name}:`, error);
-    }
-    _parseCache[name] = {
-      imports,
-      exports
-    };
-    return _parseCache[name];
-  }
-  return {
-    name: "unwasm",
-    rollup: {
-      async resolveId(id, importer) {
-        if (id === UMWASM_HELPERS_ID) {
-          return id;
-        }
-        if (id.startsWith(UNWASM_EXTERNAL_PREFIX)) {
-          return {
-            id,
-            external: true
-          };
-        }
-        if (WASM_ID_RE.test(id)) {
-          const r = await this.resolve(id, importer, { skipSelf: true });
-          if (r?.id && r.id !== id) {
-            return {
-              id: r.id.startsWith("file://") ? r.id.slice(7) : r.id,
-              external: false,
-              moduleSideEffects: false
-            };
-          }
-        }
-      },
-      generateBundle() {
-        if (opts.esmImport) {
-          for (const asset of Object.values(assets)) {
-            this.emitFile({
-              type: "asset",
-              source: asset.source,
-              fileName: asset.name
-            });
-          }
-        }
-      }
-    },
-    async load(id) {
-      if (id === UMWASM_HELPERS_ID) {
-        return getPluginUtils();
-      }
-      if (!WASM_ID_RE.test(id)) {
-        return;
-      }
-      const idPath = id.split("?")[0];
-      if (!node_fs.existsSync(idPath)) {
-        return;
-      }
-      this.addWatchFile(idPath);
-      const buff = await node_fs.promises.readFile(idPath);
-      return buff.toString("binary");
-    },
-    async transform(code, id) {
-      if (!WASM_ID_RE.test(id)) {
-        return;
-      }
-      const buff = Buffer.from(code, "binary");
-      const isModule = id.endsWith("?module");
-      const name = `wasm/${pathe.basename(id.split("?")[0], ".wasm")}-${sha1(buff)}.wasm`;
-      const parsed = isModule ? { imports: [], exports: ["default"] } : parse(name, buff);
-      const asset = assets[name] = {
-        name,
-        id,
-        source: buff,
-        imports: parsed.imports,
-        exports: parsed.exports
-      };
-      return {
-        code: isModule ? await getWasmModuleBinding(asset, opts) : await getWasmESMBinding(asset, opts),
-        map: { mappings: "" }
-      };
-    },
-    renderChunk(code, chunk) {
-      if (!opts.esmImport) {
-        return;
-      }
-      if (!(chunk.moduleIds.some((id) => WASM_ID_RE.test(id)) || chunk.imports.some((id) => WASM_ID_RE.test(id)))) {
-        return;
-      }
-      const s = new MagicString__default(code);
-      const resolveImport = (id) => {
-        if (typeof id !== "string") {
-          return;
-        }
-        const asset = assets[id];
-        if (!asset) {
-          return;
-        }
-        const nestedLevel = chunk.fileName.split("/").filter(
-          Boolean
-          /* handle // */
-        ).length - 1;
-        const relativeId = (nestedLevel ? "../".repeat(nestedLevel) : "./") + asset.name;
-        return {
-          relativeId,
-          asset
-        };
-      };
-      for (const match of code.matchAll(UNWASM_EXTERNAL_RE)) {
-        const resolved = resolveImport(match[2]);
-        const index = match.index;
-        const len = match[0].length;
-        if (!resolved || !index) {
-          console.warn(
-            `Failed to resolve WASM import: ${JSON.stringify(match[1])}`
-          );
-          continue;
-        }
-        s.overwrite(index, index + len, resolved.relativeId);
-      }
-      if (s.hasChanged()) {
-        return {
-          code: s.toString(),
-          map: s.generateMap({ includeContent: true })
-        };
-      }
-    }
-  };
-});
-const rollup = unplugin.rollup;
-const index = {
-  rollup
-};
-
-exports.default = index;
-exports.rollup = rollup;

package/dist/plugin.d.cts

@@ -1,28 +0,0 @@
-import { Plugin } from 'rollup';
-
-interface UnwasmPluginOptions {
-    /**
-     * Directly import the `.wasm` files instead of bundling as base64 string.
-     *
-     * @default false
-     */
-    esmImport?: boolean;
-    /**
-     * Avoid using top level await and always use a proxy.
-     *
-     * Useful for compatibility with environments that don't support top level await.
-     *
-     * @default false
-     */
-    lazy?: boolean;
-}
-
-declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
-declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin;
-};
-
-// @ts-ignore
-export = _default;
-export { rollup };
-export type { UnwasmPluginOptions };

package/dist/plugin.d.mts

@@ -1,26 +0,0 @@
-import { Plugin } from 'rollup';
-
-interface UnwasmPluginOptions {
-    /**
-     * Directly import the `.wasm` files instead of bundling as base64 string.
-     *
-     * @default false
-     */
-    esmImport?: boolean;
-    /**
-     * Avoid using top level await and always use a proxy.
-     *
-     * Useful for compatibility with environments that don't support top level await.
-     *
-     * @default false
-     */
-    lazy?: boolean;
-}
-
-declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
-declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin;
-};
-
-export { _default as default, rollup };
-export type { UnwasmPluginOptions };

package/dist/plugin.d.ts

@@ -1,28 +0,0 @@
-import { Plugin } from 'rollup';
-
-interface UnwasmPluginOptions {
-    /**
-     * Directly import the `.wasm` files instead of bundling as base64 string.
-     *
-     * @default false
-     */
-    esmImport?: boolean;
-    /**
-     * Avoid using top level await and always use a proxy.
-     *
-     * Useful for compatibility with environments that don't support top level await.
-     *
-     * @default false
-     */
-    lazy?: boolean;
-}
-
-declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
-declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin;
-};
-
-// @ts-ignore
-export = _default;
-export { rollup };
-export type { UnwasmPluginOptions };