Fixed values not being returned by import funciton, #14

torch2424 · Jan 19, 2020 · 458b65a · 458b65a
1 parent 80ba800
commit 458b65a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/lib/bind-function.js b/lib/bind-function.js
@@ -85,9 +85,10 @@ export function bindImportFunction(
     });
 
     // Call the import function
-    originalImport.apply(null, argumentsWithReplacedRefs);
+    const response = originalImport.apply(null, argumentsWithReplacedRefs);
 
-    // TODO: Returning from Import functions is not supported by asbind :(
+    // TODO: Returning High-level types from Import functions is not supported by asbind :(
+    return response;
   };
 
   // Initialize the state of our function

diff --git a/test/assembly/test.ts b/test/assembly/test.ts
@@ -52,7 +52,6 @@ export function mapFloat64Array(array: Float64Array): Float64Array {
   return array.map((value: f64) => value * 2);
 }
 
-// NOTE: Asbind does not support return types on import object functions
 declare function testImportString(value: string): void;
 export function callTestImportString(value: string): void {
   testImportString(value);
@@ -66,6 +65,12 @@ export function callTestImportTwoStrings(
   testImportTwoStrings(valueOne, valueTwo);
 }
 
+declare function testImportReturnNumber(): i32;
+export function callTestImportReturnNumber(): i32 {
+  let response: i32 = testImportReturnNumber();
+  return response;
+}
+
 declare function testImportInt8Array(value: Int8Array): void;
 export function callTestImportInt8Array(value: Int8Array): void {
   testImportInt8Array(value);

diff --git a/test/assembly/test.wasm b/test/assembly/test.wasm
diff --git a/test/test.js b/test/test.js
@@ -9,6 +9,7 @@ describe("asbind", () => {
     test: {
       testImportString: () => {},
       testImportTwoStrings: () => {},
+      testImportReturnNumber: () => -1,
       testImportInt8Array: () => {},
       testImportUint8Array: () => {},
       testImportInt16Array: () => {},
@@ -160,6 +161,7 @@ describe("asbind", () => {
           testImportTwoStrings: (value1, value2) => {
             testImportCalledWith = [value1, value2];
           },
+          testImportReturnNumber: () => -1,
           testImportInt8Array: importObjectFunction,
           testImportUint8Array: importObjectFunction,
           testImportInt16Array: importObjectFunction,
@@ -192,6 +194,11 @@ describe("asbind", () => {
       assert.equal(testImportCalledWith[1], "asbind2");
     });
 
+    it("should allow numbers to be returned from the importObject", () => {
+      const response = asbindInstance.exports.callTestImportReturnNumber();
+      assert.equal(response, -1);
+    });
+
     // TypedArrays
     [
       "Int8Array",
@@ -234,6 +241,7 @@ describe("asbind", () => {
           testImportTwoStrings: (value1, value2) => {
             testImportCalledWith = [value1, value2];
           },
+          testImportReturnNumber: () => -1,
           testImportInt8Array: importObjectFunction,
           testImportUint8Array: importObjectFunction,
           testImportInt16Array: importObjectFunction,