@tybys/wasm-util 0.1.0 → 0.3.0

package/lib/cjs/jspi.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapExports = exports.wrapAsyncExport = exports.wrapAsyncImport = void 0;
+const util_1 = require("./wasi/util");
+const webassembly_1 = require("./webassembly");
+function checkWebAssemblyFunction() {
+    const WebAssemblyFunction = webassembly_1._WebAssembly.Function;
+    if (typeof WebAssemblyFunction !== 'function') {
+        throw new Error('WebAssembly.Function is not supported in this environment.' +
+            ' If you are using V8 based browser like Chrome, try to specify' +
+            ' --js-flag="--wasm-staging --experimental-wasm-stack-switching"');
+    }
+    return WebAssemblyFunction;
+}
+/** @public */
+function wrapAsyncImport(f, parameterType, returnType) {
+    const WebAssemblyFunction = checkWebAssemblyFunction();
+    if (typeof f !== 'function') {
+        throw new TypeError('Function required');
+    }
+    const parameters = parameterType.slice(0);
+    parameters.unshift('externref');
+    return new WebAssemblyFunction({ parameters, results: returnType }, f, { suspending: 'first' });
+}
+exports.wrapAsyncImport = wrapAsyncImport;
+/** @public */
+function wrapAsyncExport(f) {
+    const WebAssemblyFunction = checkWebAssemblyFunction();
+    if (typeof f !== 'function') {
+        throw new TypeError('Function required');
+    }
+    return new WebAssemblyFunction({ parameters: [...WebAssemblyFunction.type(f).parameters.slice(1)], results: ['externref'] }, f, { promising: 'first' });
+}
+exports.wrapAsyncExport = wrapAsyncExport;
+/** @public */
+function wrapExports(exports, needWrap) {
+    return (0, util_1.wrapInstanceExports)(exports, (exportValue, name) => {
+        let ignore = typeof exportValue !== 'function';
+        if (Array.isArray(needWrap)) {
+            ignore = ignore || (needWrap.indexOf(name) === -1);
+        }
+        return ignore ? exportValue : wrapAsyncExport(exportValue);
+    });
+}
+exports.wrapExports = wrapExports;
+//# sourceMappingURL=jspi.js.map

package/lib/cjs/load.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadSync = exports.load = void 0;
+const webassembly_1 = require("./webassembly");
 const asyncify_1 = require("./asyncify");
 async function fetchWasm(urlOrBuffer, imports) {
+    if (typeof wx !== 'undefined' && typeof __wxConfig !== 'undefined') {
+        return await webassembly_1._WebAssembly.instantiate(urlOrBuffer, imports);
+    }
     const response = await fetch(urlOrBuffer);
     const buffer = await response.arrayBuffer();
-    const source = await WebAssembly.instantiate(buffer, imports);
+    const source = await webassembly_1._WebAssembly.instantiate(buffer, imports);
     return source;
 }
 /** @public */
@@ -22,7 +26,7 @@ async function load(urlOrBuffer, imports, asyncify) {
         imports = asyncifyHelper.wrapImports(imports);
     }
     if (urlOrBuffer instanceof ArrayBuffer || ArrayBuffer.isView(urlOrBuffer)) {
-        source = await WebAssembly.instantiate(urlOrBuffer, imports);
+        source = await webassembly_1._WebAssembly.instantiate(urlOrBuffer, imports);
         if (asyncify) {
             const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
             return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
@@ -32,9 +36,9 @@ async function load(urlOrBuffer, imports, asyncify) {
     if (typeof urlOrBuffer !== 'string' && !(urlOrBuffer instanceof URL)) {
         throw new TypeError('Invalid source');
     }
-    if (typeof WebAssembly.instantiateStreaming === 'function') {
+    if (typeof webassembly_1._WebAssembly.instantiateStreaming === 'function') {
         try {
-            source = await WebAssembly.instantiateStreaming(fetch(urlOrBuffer), imports);
+            source = await webassembly_1._WebAssembly.instantiateStreaming(fetch(urlOrBuffer), imports);
         }
         catch (_) {
             source = await fetchWasm(urlOrBuffer, imports);
@@ -65,8 +69,8 @@ function loadSync(buffer, imports, asyncify) {
         asyncifyHelper = new asyncify_1.Asyncify();
         imports = asyncifyHelper.wrapImports(imports);
     }
-    const module = new WebAssembly.Module(buffer);
-    const instance = new WebAssembly.Instance(module, imports);
+    const module = new webassembly_1._WebAssembly.Module(buffer);
+    const instance = new webassembly_1._WebAssembly.Instance(module, imports);
     const source = { instance, module };
     if (asyncify) {
         const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);

package/lib/cjs/memory.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendMemory = exports.Memory = void 0;
+exports.extendMemory = exports.Memory = exports.WebAssemblyMemory = void 0;
+const webassembly_1 = require("./webassembly");
 /** @public */
-class Memory extends WebAssembly.Memory {
+exports.WebAssemblyMemory = webassembly_1._WebAssembly.Memory;
+/** @public */
+class Memory extends exports.WebAssemblyMemory {
     // eslint-disable-next-line @typescript-eslint/no-useless-constructor
     constructor(descriptor) {
         super(descriptor);
@@ -22,7 +25,7 @@ class Memory extends WebAssembly.Memory {
 exports.Memory = Memory;
 /** @public */
 function extendMemory(memory) {
-    if (Object.getPrototypeOf(memory) === WebAssembly.Memory.prototype) {
+    if (Object.getPrototypeOf(memory) === webassembly_1._WebAssembly.Memory.prototype) {
         Object.setPrototypeOf(memory, Memory.prototype);
     }
     return memory;

package/lib/cjs/wasi/preview1.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WASI = void 0;
+// import { vol } from 'memfs-browser'
+const webassembly_1 = require("../webassembly");
 const path_1 = require("./path");
 const types_1 = require("./types");
 const fd_1 = require("./fd");
@@ -113,7 +115,7 @@ function readStdin() {
 class WASI {
     constructor(args, env, preopens, stdio, filesystem, print, printErr) {
         this._setMemory = function _setMemory(m) {
-            if (!(m instanceof WebAssembly.Memory)) {
+            if (!(m instanceof webassembly_1._WebAssembly.Memory)) {
                 throw new TypeError('"instance.exports.memory" property must be a WebAssembly.Memory');
             }
             _memory.set(this, (0, memory_1.extendMemory)(m));
@@ -420,6 +422,9 @@ class WASI {
             let buffer;
             let nread = 0;
             if (fd === 0) {
+                if (typeof window === 'undefined' || typeof window.prompt !== 'function') {
+                    return types_1.WasiErrno.ENOTSUP;
+                }
                 buffer = readStdin();
                 nread = buffer ? copyMemory(ioVecs, buffer) : 0;
             }

package/lib/cjs/wasi/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPromiseLike = exports.validateInt32 = exports.validateUndefined = exports.validateFunction = exports.validateString = exports.validateBoolean = exports.validateArray = exports.validateObject = void 0;
+exports.wrapInstanceExports = exports.isPromiseLike = exports.validateInt32 = exports.validateUndefined = exports.validateFunction = exports.validateString = exports.validateBoolean = exports.validateArray = exports.validateObject = void 0;
 function validateObject(value, name) {
     if (value === null || typeof value !== 'object') {
         throw new TypeError(`${name} must be an object. Received ${value === null ? 'null' : typeof value}`);
@@ -53,4 +53,16 @@ function isPromiseLike(obj) {
     return !!(obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function');
 }
 exports.isPromiseLike = isPromiseLike;
+function wrapInstanceExports(exports, mapFn) {
+    const newExports = Object.create(null);
+    Object.keys(exports).forEach(name => {
+        const exportValue = exports[name];
+        Object.defineProperty(newExports, name, {
+            enumerable: true,
+            value: mapFn(exportValue, name)
+        });
+    });
+    return newExports;
+}
+exports.wrapInstanceExports = wrapInstanceExports;
 //# sourceMappingURL=util.js.map

package/lib/cjs/webassembly.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._WebAssembly = void 0;
+const _WebAssembly = typeof WebAssembly !== 'undefined'
+    ? WebAssembly
+    : typeof WXWebAssembly !== 'undefined'
+        ? WXWebAssembly
+        : undefined;
+exports._WebAssembly = _WebAssembly;
+if (!_WebAssembly) {
+    throw new Error('WebAssembly is not supported in this environment');
+}
+//# sourceMappingURL=webassembly.js.map

package/lib/mjs/asyncify.mjs

@@ -1,4 +1,5 @@
-import { isPromiseLike } from "./wasi/util.mjs";
+import { _WebAssembly } from "./webassembly.mjs";
+import { isPromiseLike, wrapInstanceExports } from "./wasi/util.mjs";
 const ignoreNames = [
     'asyncify_get_state',
     'asyncify_start_rewind',
@@ -43,7 +44,7 @@ export class Asyncify {
         if (this.exports) {
             throw new Error('Asyncify has been initialized');
         }
-        if (!(memory instanceof WebAssembly.Memory)) {
+        if (!(memory instanceof _WebAssembly.Memory)) {
             throw new TypeError('Require WebAssembly.Memory object');
         }
         const exports = instance.exports;
@@ -78,7 +79,7 @@ export class Asyncify {
             new Int32Array(memory.buffer, this.dataPtr).set([address.start, address.end]);
         }
         this.exports = this.wrapExports(exports, options.wrapExports);
-        const asyncifiedInstance = Object.create(WebAssembly.Instance.prototype);
+        const asyncifiedInstance = Object.create(_WebAssembly.Instance.prototype);
         Object.defineProperty(asyncifiedInstance, 'exports', { value: this.exports });
         // Object.setPrototypeOf(instance, Instance.prototype)
         return asyncifiedInstance;
@@ -137,20 +138,13 @@ export class Asyncify {
         });
     }
     wrapExports(exports, needWrap) {
-        const newExports = Object.create(null);
-        Object.keys(exports).forEach(name => {
-            const exportValue = exports[name];
+        return wrapInstanceExports(exports, (exportValue, name) => {
             let ignore = ignoreNames.indexOf(name) !== -1 || typeof exportValue !== 'function';
             if (Array.isArray(needWrap)) {
                 ignore = ignore || (needWrap.indexOf(name) === -1);
             }
-            Object.defineProperty(newExports, name, {
-                enumerable: true,
-                value: ignore ? exportValue : this.wrapExportFunction(exportValue)
-            });
+            return ignore ? exportValue : this.wrapExportFunction(exportValue);
         });
-        // wrappedExports.set(exports, newExports)
-        return newExports;
     }
 }
 // /** @public */

package/lib/mjs/index.mjs

@@ -5,3 +5,4 @@ export * from "./asyncify.mjs";
 export * from "./load.mjs";
 export * from "./wasi/index.mjs";
 export * from "./memory.mjs";
+export * from "./jspi.mjs";

package/lib/mjs/jspi.mjs

@@ -0,0 +1,39 @@
+import { wrapInstanceExports } from "./wasi/util.mjs";
+import { _WebAssembly } from "./webassembly.mjs";
+function checkWebAssemblyFunction() {
+    const WebAssemblyFunction = _WebAssembly.Function;
+    if (typeof WebAssemblyFunction !== 'function') {
+        throw new Error('WebAssembly.Function is not supported in this environment.' +
+            ' If you are using V8 based browser like Chrome, try to specify' +
+            ' --js-flag="--wasm-staging --experimental-wasm-stack-switching"');
+    }
+    return WebAssemblyFunction;
+}
+/** @public */
+export function wrapAsyncImport(f, parameterType, returnType) {
+    const WebAssemblyFunction = checkWebAssemblyFunction();
+    if (typeof f !== 'function') {
+        throw new TypeError('Function required');
+    }
+    const parameters = parameterType.slice(0);
+    parameters.unshift('externref');
+    return new WebAssemblyFunction({ parameters, results: returnType }, f, { suspending: 'first' });
+}
+/** @public */
+export function wrapAsyncExport(f) {
+    const WebAssemblyFunction = checkWebAssemblyFunction();
+    if (typeof f !== 'function') {
+        throw new TypeError('Function required');
+    }
+    return new WebAssemblyFunction({ parameters: [...WebAssemblyFunction.type(f).parameters.slice(1)], results: ['externref'] }, f, { promising: 'first' });
+}
+/** @public */
+export function wrapExports(exports, needWrap) {
+    return wrapInstanceExports(exports, (exportValue, name) => {
+        let ignore = typeof exportValue !== 'function';
+        if (Array.isArray(needWrap)) {
+            ignore = ignore || (needWrap.indexOf(name) === -1);
+        }
+        return ignore ? exportValue : wrapAsyncExport(exportValue);
+    });
+}

package/lib/mjs/load.mjs

@@ -1,8 +1,12 @@
+import { _WebAssembly } from "./webassembly.mjs";
 import { Asyncify } from "./asyncify.mjs";
 async function fetchWasm(urlOrBuffer, imports) {
+    if (typeof wx !== 'undefined' && typeof __wxConfig !== 'undefined') {
+        return await _WebAssembly.instantiate(urlOrBuffer, imports);
+    }
     const response = await fetch(urlOrBuffer);
     const buffer = await response.arrayBuffer();
-    const source = await WebAssembly.instantiate(buffer, imports);
+    const source = await _WebAssembly.instantiate(buffer, imports);
     return source;
 }
 /** @public */
@@ -19,7 +23,7 @@ export async function load(urlOrBuffer, imports, asyncify) {
         imports = asyncifyHelper.wrapImports(imports);
     }
     if (urlOrBuffer instanceof ArrayBuffer || ArrayBuffer.isView(urlOrBuffer)) {
-        source = await WebAssembly.instantiate(urlOrBuffer, imports);
+        source = await _WebAssembly.instantiate(urlOrBuffer, imports);
         if (asyncify) {
             const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
             return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
@@ -29,9 +33,9 @@ export async function load(urlOrBuffer, imports, asyncify) {
     if (typeof urlOrBuffer !== 'string' && !(urlOrBuffer instanceof URL)) {
         throw new TypeError('Invalid source');
     }
-    if (typeof WebAssembly.instantiateStreaming === 'function') {
+    if (typeof _WebAssembly.instantiateStreaming === 'function') {
         try {
-            source = await WebAssembly.instantiateStreaming(fetch(urlOrBuffer), imports);
+            source = await _WebAssembly.instantiateStreaming(fetch(urlOrBuffer), imports);
         }
         catch (_) {
             source = await fetchWasm(urlOrBuffer, imports);
@@ -61,8 +65,8 @@ export function loadSync(buffer, imports, asyncify) {
         asyncifyHelper = new Asyncify();
         imports = asyncifyHelper.wrapImports(imports);
     }
-    const module = new WebAssembly.Module(buffer);
-    const instance = new WebAssembly.Instance(module, imports);
+    const module = new _WebAssembly.Module(buffer);
+    const instance = new _WebAssembly.Instance(module, imports);
     const source = { instance, module };
     if (asyncify) {
         const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);

package/lib/mjs/memory.mjs

@@ -1,5 +1,8 @@
+import { _WebAssembly } from "./webassembly.mjs";
 /** @public */
-export class Memory extends WebAssembly.Memory {
+export const WebAssemblyMemory = _WebAssembly.Memory;
+/** @public */
+export class Memory extends WebAssemblyMemory {
     // eslint-disable-next-line @typescript-eslint/no-useless-constructor
     constructor(descriptor) {
         super(descriptor);
@@ -18,7 +21,7 @@ export class Memory extends WebAssembly.Memory {
 }
 /** @public */
 export function extendMemory(memory) {
-    if (Object.getPrototypeOf(memory) === WebAssembly.Memory.prototype) {
+    if (Object.getPrototypeOf(memory) === _WebAssembly.Memory.prototype) {
         Object.setPrototypeOf(memory, Memory.prototype);
     }
     return memory;

package/lib/mjs/wasi/preview1.mjs

@@ -1,3 +1,4 @@
+import { _WebAssembly } from "../webassembly.mjs";
 import { resolve } from "./path.mjs";
 import { WasiErrno, WasiRights, FileControlFlag, WasiFileControlFlag, WasiFdFlag, WasiFileType, WasiClockid, WasiFstFlag } from "./types.mjs";
 import { FileDescriptorTable, concatBuffer, toFileStat } from "./fd.mjs";
@@ -110,7 +111,7 @@ function readStdin() {
 export class WASI {
     constructor(args, env, preopens, stdio, filesystem, print, printErr) {
         this._setMemory = function _setMemory(m) {
-            if (!(m instanceof WebAssembly.Memory)) {
+            if (!(m instanceof _WebAssembly.Memory)) {
                 throw new TypeError('"instance.exports.memory" property must be a WebAssembly.Memory');
             }
             _memory.set(this, extendMemory(m));
@@ -417,6 +418,9 @@ export class WASI {
             let buffer;
             let nread = 0;
             if (fd === 0) {
+                if (typeof window === 'undefined' || typeof window.prompt !== 'function') {
+                    return WasiErrno.ENOTSUP;
+                }
                 buffer = readStdin();
                 nread = buffer ? copyMemory(ioVecs, buffer) : 0;
             }

package/lib/mjs/wasi/util.mjs

@@ -42,3 +42,14 @@ export function validateInt32(value, name, min = -2147483648, max = 2147483647)
 export function isPromiseLike(obj) {
     return !!(obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function');
 }
+export function wrapInstanceExports(exports, mapFn) {
+    const newExports = Object.create(null);
+    Object.keys(exports).forEach(name => {
+        const exportValue = exports[name];
+        Object.defineProperty(newExports, name, {
+            enumerable: true,
+            value: mapFn(exportValue, name)
+        });
+    });
+    return newExports;
+}

package/lib/mjs/webassembly.mjs

@@ -0,0 +1,9 @@
+const _WebAssembly = typeof WebAssembly !== 'undefined'
+    ? WebAssembly
+    : typeof WXWebAssembly !== 'undefined'
+        ? WXWebAssembly
+        : undefined;
+if (!_WebAssembly) {
+    throw new Error('WebAssembly is not supported in this environment');
+}
+export { _WebAssembly };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tybys/wasm-util",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "WASI polyfill for browser and some wasm util",
   "main": "./lib/cjs/index.js",
   "module": "./dist/wasm-util.esm-bundler.js",