unwasm 0.3.9 → 0.3.11

package/README.md

@@ -3,7 +3,7 @@
 <!-- automd:badges color=yellow codecov -->
 
 [![npm version](https://img.shields.io/npm/v/unwasm?color=yellow)](https://npmjs.com/package/unwasm)
-[![npm downloads](https://img.shields.io/npm/dm/unwasm?color=yellow)](https://npmjs.com/package/unwasm)
+[![npm downloads](https://img.shields.io/npm/dm/unwasm?color=yellow)](https://npm.chart.dev/unwasm)
 [![codecov](https://img.shields.io/codecov/c/gh/unjs/unwasm?color=yellow)](https://codecov.io/gh/unjs/unwasm)
 
 <!-- /automd -->
@@ -100,6 +100,9 @@ pnpm install unwasm
 
 # bun
 bun install unwasm
+
+# deno
+deno install unwasm
 ```
 
 <!-- /automd -->
@@ -140,7 +143,7 @@ Parses `wasm` binary format with useful information using [webassemblyjs/wasm-pa
 import { readFile } from "node:fs/promises";
 import { parseWasm } from "unwasm/tools";
 
-const source = await readFile(new URL("./examples/sum.wasm", import.meta.url));
+const source = await readFile(new URL("examples/sum.wasm", import.meta.url));
 const parsed = parseWasm(source);
 console.log(JSON.stringify(parsed, undefined, 2));
 ```
@@ -184,7 +187,7 @@ To hint to the bundler how to resolve imports needed by the `.wasm` file, you ne
 
 **Example:**
 
-```js
+```json
 {
   "exports": {
     "./rand.wasm": "./rand.wasm"

package/dist/plugin.cjs

@@ -7,7 +7,6 @@ const pathe = require('pathe');
 const MagicString = require('magic-string');
 const unplugin$1 = require('unplugin');
 const node_crypto = require('node:crypto');
-const pkgTypes = require('pkg-types');
 const knitwork = require('knitwork');
 const tools = require('./tools.cjs');
 
@@ -22,30 +21,100 @@ function sha1(source) {
   return node_crypto.createHash("sha1").update(source).digest("hex").slice(0, 16);
 }
 
-const js = String.raw;
+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 envCode = opts.esmImport ? js`
-${autoImports.code};
+  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)
+const _mod = await import("${UNWASM_EXTERNAL_PREFIX}${asset.name}").then(r => r.default || r);
+return WebAssembly.instantiate(_mod, imports)
+}
+  `
+  );
 }
-  ` : js`
+function getBase64Instantiate(asset, importsCode) {
+  return (
+    /* js */
+    `
 import { base64ToUint8Array } from "${UMWASM_HELPERS_ID}";
-${autoImports.code};
+
+${importsCode}
 
 function _instantiate(imports = _imports) {
   const _data = base64ToUint8Array("${asset.source.toString("base64")}")
-  return WebAssembly.instantiate(_data, imports)
+  return WebAssembly.instantiate(_data, imports)  }
+  `
+  );
 }
-  `;
-  const canTopAwait = opts.lazy !== true && autoImports.resolved;
-  if (canTopAwait) {
-    return js`
+function getExports(asset, instantiateCode) {
+  return (
+    /* js */
+    `
 import { getExports } from "${UMWASM_HELPERS_ID}";
-${envCode}
+
+${instantiateCode}
 
 const $exports = getExports(await _instantiate());
 
@@ -54,35 +123,32 @@ ${asset.exports.map((name) => `export const ${name} = $exports.${name};`).join("
 const defaultExport = () => $exports;
 ${asset.exports.map((name) => `defaultExport["${name}"] = $exports.${name};`).join("\n")}
 export default defaultExport;
-    `;
-  } else {
-    return js`
+      `
+  );
+}
+function getLazyExports(asset, instantiateCode) {
+  return (
+    /* js */
+    `
 import { createLazyWasmModule } from "${UMWASM_HELPERS_ID}";
-${envCode}
+
+${instantiateCode}
 
 const _mod = createLazyWasmModule(_instantiate);
 
 ${asset.exports.map((name) => `export const ${name} = _mod.${name};`).join("\n")}
 
 export default _mod;
-    `;
-  }
-}
-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 getPluginUtils() {
-  return js`
+  return (
+    /* js */
+    `
 export function debug(...args) {
-  console.log('[wasm] [debug]', ...args);
+  console.log('[unwasm] [debug]', ...args);
 }
 
 export function getExports(input) {
@@ -150,43 +216,8 @@ export function createLazyWasmModule(_instantiator) {
 
   return lazyProxy;
 }
-  `;
-}
-async function getWasmImports(asset, _opts) {
-  const importNames = Object.keys(asset.imports || {});
-  if (importNames.length === 0) {
-    return {
-      code: "const _imports = { /* no imports */ }",
-      resolved: true
-    };
-  }
-  const pkgJSON = await pkgTypes.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) {
-      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
-  };
+  `
+  );
 }
 
 const WASM_ID_RE = /\.wasm\??.*$/i;

package/dist/plugin.d.cts

@@ -19,7 +19,10 @@ interface UnwasmPluginOptions {
 
 declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
 declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin<any>;
+    rollup: (opts: UnwasmPluginOptions) => Plugin;
 };
 
-export { type UnwasmPluginOptions, _default as default, rollup };
+// @ts-ignore
+export = _default;
+export { rollup };
+export type { UnwasmPluginOptions };

package/dist/plugin.d.mts

@@ -19,7 +19,8 @@ interface UnwasmPluginOptions {
 
 declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
 declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin<any>;
+    rollup: (opts: UnwasmPluginOptions) => Plugin;
 };
 
-export { type UnwasmPluginOptions, _default as default, rollup };
+export { _default as default, rollup };
+export type { UnwasmPluginOptions };

package/dist/plugin.d.ts

@@ -19,7 +19,10 @@ interface UnwasmPluginOptions {
 
 declare const rollup: (opts: UnwasmPluginOptions) => Plugin;
 declare const _default: {
-    rollup: (opts: UnwasmPluginOptions) => Plugin<any>;
+    rollup: (opts: UnwasmPluginOptions) => Plugin;
 };
 
-export { type UnwasmPluginOptions, _default as default, rollup };
+// @ts-ignore
+export = _default;
+export { rollup };
+export type { UnwasmPluginOptions };

package/dist/plugin.mjs

@@ -3,7 +3,6 @@ import { basename } from 'pathe';
 import MagicString from 'magic-string';
 import { createUnplugin } from 'unplugin';
 import { createHash } from 'node:crypto';
-import { readPackageJSON } from 'pkg-types';
 import { genSafeVariableName, genImport, genString, genObjectFromRaw } from 'knitwork';
 import { parseWasm } from './tools.mjs';
 
@@ -14,30 +13,100 @@ function sha1(source) {
   return createHash("sha1").update(source).digest("hex").slice(0, 16);
 }
 
-const js = String.raw;
+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_" + genSafeVariableName(moduleName);
+    if (pkgImport && typeof pkgImport === "string") {
+      imports.push(genImport(pkgImport, { name: "*", as: importName }));
+    } else {
+      resolved = false;
+    }
+    importsObject[moduleName] = Object.fromEntries(
+      importNames2.map((name) => [
+        name,
+        pkgImport ? `${importName}[${genString(name)}]` : `() => { throw new Error(${genString(moduleName + "." + importName)} + " is not provided!")}`
+      ])
+    );
+  }
+  const code = `${imports.join("\n")}
+
+const _imports = ${genObjectFromRaw(importsObject)}`;
+  return {
+    code,
+    resolved
+  };
+}
+
 async function getWasmESMBinding(asset, opts) {
   const autoImports = await getWasmImports(asset);
-  const envCode = opts.esmImport ? js`
-${autoImports.code};
+  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)
+const _mod = await import("${UNWASM_EXTERNAL_PREFIX}${asset.name}").then(r => r.default || r);
+return WebAssembly.instantiate(_mod, imports)
 }
-  ` : js`
+  `
+  );
+}
+function getBase64Instantiate(asset, importsCode) {
+  return (
+    /* js */
+    `
 import { base64ToUint8Array } from "${UMWASM_HELPERS_ID}";
-${autoImports.code};
+
+${importsCode}
 
 function _instantiate(imports = _imports) {
   const _data = base64ToUint8Array("${asset.source.toString("base64")}")
-  return WebAssembly.instantiate(_data, imports)
+  return WebAssembly.instantiate(_data, imports)  }
+  `
+  );
 }
-  `;
-  const canTopAwait = opts.lazy !== true && autoImports.resolved;
-  if (canTopAwait) {
-    return js`
+function getExports(asset, instantiateCode) {
+  return (
+    /* js */
+    `
 import { getExports } from "${UMWASM_HELPERS_ID}";
-${envCode}
+
+${instantiateCode}
 
 const $exports = getExports(await _instantiate());
 
@@ -46,35 +115,32 @@ ${asset.exports.map((name) => `export const ${name} = $exports.${name};`).join("
 const defaultExport = () => $exports;
 ${asset.exports.map((name) => `defaultExport["${name}"] = $exports.${name};`).join("\n")}
 export default defaultExport;
-    `;
-  } else {
-    return js`
+      `
+  );
+}
+function getLazyExports(asset, instantiateCode) {
+  return (
+    /* js */
+    `
 import { createLazyWasmModule } from "${UMWASM_HELPERS_ID}";
-${envCode}
+
+${instantiateCode}
 
 const _mod = createLazyWasmModule(_instantiate);
 
 ${asset.exports.map((name) => `export const ${name} = _mod.${name};`).join("\n")}
 
 export default _mod;
-    `;
-  }
-}
-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 getPluginUtils() {
-  return js`
+  return (
+    /* js */
+    `
 export function debug(...args) {
-  console.log('[wasm] [debug]', ...args);
+  console.log('[unwasm] [debug]', ...args);
 }
 
 export function getExports(input) {
@@ -142,43 +208,8 @@ export function createLazyWasmModule(_instantiator) {
 
   return lazyProxy;
 }
-  `;
-}
-async function getWasmImports(asset, _opts) {
-  const importNames = Object.keys(asset.imports || {});
-  if (importNames.length === 0) {
-    return {
-      code: "const _imports = { /* no imports */ }",
-      resolved: true
-    };
-  }
-  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_" + genSafeVariableName(moduleName);
-    if (pkgImport) {
-      imports.push(genImport(pkgImport, { name: "*", as: importName }));
-    } else {
-      resolved = false;
-    }
-    importsObject[moduleName] = Object.fromEntries(
-      importNames2.map((name) => [
-        name,
-        pkgImport ? `${importName}[${genString(name)}]` : `() => { throw new Error(${genString(moduleName + "." + importName)} + " is not provided!")}`
-      ])
-    );
-  }
-  const code = `${imports.join("\n")}
-
-const _imports = ${genObjectFromRaw(importsObject)}`;
-  return {
-    code,
-    resolved
-  };
+  `
+  );
 }
 
 const WASM_ID_RE = /\.wasm\??.*$/i;