feat: use Thenable dynamic import

xtuc · Mar 29, 2018 · b207fb8 · b207fb8
1 parent b700bca
commit b207fb8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 30 deletions.
diff --git a/example/bundle.js b/example/bundle.js
@@ -10,7 +10,30 @@ function logfoo() {
   console.log("foo");
 }
 
-function instantiate() {
+// (module
+//   (import "./env.js" "mem" (memory 1))
+//   (import "./env.js" "number" (global i32))
+//   (import "./env.js" "logfoo" (func))
+//
+//   (func (export "test") (result i32)
+//     (i32.load8_s (i32.const 0))
+//   )
+//   (func (export "getNumber") (result i32)
+//     (get_global 0)
+//   )
+//   (func (export "logfoofromwasm") call 0)
+// )
+
+Promise.resolve().then(function () { return test; }).then(({test, getNumber, logfoofromwasm}) => {
+  const i32 = new Uint32Array(mem.buffer);
+  console.log("test()", test(), "expected", i32[0]);
+
+  console.log("getNumber()", getNumber());
+
+  logfoofromwasm();
+});
+
+function then(resolve) {
     if (typeof WebAssembly === 'undefined') {
       throw new Error('WebAssembly is not supported');
     }
@@ -25,35 +48,18 @@ function instantiate() {
 
     const req = window.fetch("/modulee01d.wasm");
 
-    return WebAssembly
+    WebAssembly
       .instantiateStreaming(req, {"./env.js":{
 "mem":mem,
 "number":number,
 "logfoo":logfoo,
 },
 })
-      .then(res => res.instance.exports);
+      .then(res => res.instance.exports)
+      .then(resolve)
+      .catch(resolve);
   }
 
-// (module
-//   (import "./env.js" "mem" (memory 1))
-//   (import "./env.js" "number" (global i32))
-//   (import "./env.js" "logfoo" (func))
-//
-//   (func (export "test") (result i32)
-//     (i32.load8_s (i32.const 0))
-//   )
-//   (func (export "getNumber") (result i32)
-//     (get_global 0)
-//   )
-//   (func (export "logfoofromwasm") call 0)
-// )
-
-instantiate().then(({test, getNumber, logfoofromwasm}) => {
-  const i32 = new Uint32Array(mem.buffer);
-  console.log("test()", test(), "expected", i32[0]);
-
-  console.log("getNumber()", getNumber());
-
-  logfoofromwasm();
+var test = /*#__PURE__*/Object.freeze({
+  then: then
 });
diff --git a/example/src/index.js b/example/src/index.js
@@ -1,5 +1,3 @@
-import instantiate from "./test.wasm"
-
 import {mem} from "./env.js"
 
 // (module
@@ -16,7 +14,7 @@ import {mem} from "./env.js"
 //   (func (export "logfoofromwasm") call 0)
 // )
 
-instantiate().then(({test, getNumber, logfoofromwasm}) => {
+import("./test.wasm").then(({test, getNumber, logfoofromwasm}) => {
   const i32 = new Uint32Array(mem.buffer);
   console.log("test()", test(), "expected", i32[0]);
 

diff --git a/src/index.js b/src/index.js
@@ -39,7 +39,7 @@ function generateImportObject(o) {
 const buildLoader = ({URL, IMPORT_OBJECT, IMPORTS}) => (`
   ${IMPORTS}
 
-  export default function instantiate() {
+  export function then(resolve) {
     if (typeof WebAssembly === 'undefined') {
       throw new Error('WebAssembly is not supported');
     }
@@ -54,9 +54,11 @@ const buildLoader = ({URL, IMPORT_OBJECT, IMPORTS}) => (`
 
     const req = window.fetch("${URL}");
 
-    return WebAssembly
+    WebAssembly
       .instantiateStreaming(req, ${IMPORT_OBJECT})
-      .then(res => res.instance.exports);
+      .then(res => res.instance.exports)
+      .then(resolve)
+      .catch(resolve);
   }
 `);
 
@@ -114,5 +116,9 @@ export default function (options = {}) {
 
     transform,
     ongenerate,
+
+    options(opts) {
+      opts.experimentalDynamicImport = true;
+    }
   };
 }