keep callbacks on stack to allow nested consumer usage

mozilla · Apr 21, 2018 · 121d627 · 121d627
1 parent b93aadb
commit 121d627
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/wasm.js b/lib/wasm.js
@@ -20,7 +20,7 @@ module.exports = function wasm() {
     return cachedWasm;
   }
 
-  let currentCallback = null;
+  const callbackStack = [];
 
   cachedWasm = readWasm().then(buffer => {
       return WebAssembly.instantiate(buffer, {
@@ -61,7 +61,7 @@ module.exports = function wasm() {
               }
             }
 
-            currentCallback(mapping);
+            callbackStack[callbackStack.length - 1](mapping);
           },
 
           start_all_generated_locations_for: function () { console.time("all_generated_locations_for"); },
@@ -90,11 +90,11 @@ module.exports = function wasm() {
     return {
       exports: wasm.instance.exports,
       withMappingCallback: (mappingCallback, f) => {
-        currentCallback = mappingCallback;
+        callbackStack.push(mappingCallback)
         try {
           f();
         } finally {
-          currentCallback = null;
+          callbackStack.pop()
         }
       }
     };