Add binding for array of bool

torch2424 · Feb 17, 2021 · 3e55c4a · 3e55c4a
1 parent 10b68a5
commit 3e55c4a
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 9 deletions.
diff --git a/lib/asbind-instance/supported-ref-types.js b/lib/asbind-instance/supported-ref-types.js
@@ -299,6 +299,22 @@ export const SUPPORTED_REF_TYPES = {
         .map(value => wasmExports.__getString(value));
     }
   },
+  BOOLARRAY: {
+    isTypeFromArgument: arg => {
+      return Array.isArray(arg) && typeof arg[0] === "boolean";
+    },
+    isTypeFromReference: (wasmExports, ref) => {
+      return wasmExports.__instanceof(ref, wasmExports.__asbind_BoolArray_ID);
+    },
+    getRef: (wasmExports, arg) => {
+      return wasmExports.__pin(
+        wasmExports.__newArray(wasmExports.__asbind_BoolArray_ID, arg)
+      );
+    },
+    getValueFromRef: (wasmExports, responseRef) => {
+      return wasmExports.__getArray(responseRef).map(value => !!value);
+    }
+  },
   I32ARRAYARRAY: {
     isTypeFromArgument: arg => {
       return (
@@ -396,6 +412,36 @@ export const SUPPORTED_REF_TYPES = {
           wasmExports.__getArray(value).map(v => wasmExports.__getString(v))
         );
     }
+  },
+  BOOLARRAYARRAY: {
+    isTypeFromArgument: arg => {
+      return (
+        Array.isArray(arg) &&
+        Array.isArray(arg[0]) &&
+        typeof arg[0][0] === "boolean"
+      );
+    },
+    isTypeFromReference: (wasmExports, ref) => {
+      return wasmExports.__instanceof(
+        ref,
+        wasmExports.__asbind_BoolArrayArray_ID
+      );
+    },
+    getRef: (wasmExports, arg) => {
+      const refs = arg.map(value =>
+        wasmExports.__pin(
+          wasmExports.__newArray(wasmExports.__asbind_BoolArray_ID, value)
+        )
+      );
+      return wasmExports.__pin(
+        wasmExports.__newArray(wasmExports.__asbind_BoolArrayArray_ID, refs)
+      );
+    },
+    getValueFromRef: (wasmExports, responseRef) => {
+      return wasmExports
+        .__getArray(responseRef)
+        .map(value => wasmExports.__getArray(value).map(v => !!v));
+    }
   }
 };
 

diff --git a/lib/assembly/as-bind.ts b/lib/assembly/as-bind.ts
@@ -27,6 +27,8 @@ export const __asbind_Uint64Array_ID = idof<Uint64Array>();
 export const __asbind_I32Array_ID = idof<Array<i32>>();
 export const __asbind_I64Array_ID = idof<Array<i64>>();
 export const __asbind_StringArray_ID = idof<Array<string>>();
+export const __asbind_BoolArray_ID = idof<Array<bool>>();
 export const __asbind_I32ArrayArray_ID = idof<Array<Array<i32>>>();
 export const __asbind_I64ArrayArray_ID = idof<Array<Array<i64>>>();
-export const __asbind_StringArrayArray_ID = idof<Array<Array<String>>>();
+export const __asbind_StringArrayArray_ID = idof<Array<Array<string>>>();
+export const __asbind_BoolArrayArray_ID = idof<Array<Array<bool>>>();
diff --git a/test/assembly/test.ts b/test/assembly/test.ts
@@ -93,8 +93,12 @@ export function mapI64Array(array: Array<i64>): Array<i64> {
   return array.map<i64>((value: i64) => value * 2);
 }
 
-export function mapStringArray(array: Array<String>): Array<String> {
-  return array.map<String>((value: String) => "#" + value);
+export function mapStringArray(array: Array<string>): Array<string> {
+  return array.map<string>((value: string) => "#" + value);
+}
+
+export function mapBoolArray(array: Array<bool>): Array<bool> {
+  return array.map<bool>((value: bool) => !value);
 }
 
 export function mapI32ArrayArray(array: Array<Array<i32>>): Array<Array<i32>> {
@@ -110,10 +114,18 @@ export function mapI64ArrayArray(array: Array<Array<i64>>): Array<Array<i64>> {
 }
 
 export function mapStringArrayArray(
-  array: Array<Array<String>>
-): Array<Array<String>> {
-  return array.map<Array<String>>((value: Array<String>) =>
-    value.map<String>((v: String) => "#" + v)
+  array: Array<Array<string>>
+): Array<Array<string>> {
+  return array.map<Array<string>>((value: Array<string>) =>
+    value.map<string>((v: string) => "#" + v)
+  );
+}
+
+export function mapBoolArrayArray(
+  array: Array<Array<bool>>
+): Array<Array<bool>> {
+  return array.map<Array<bool>>((value: Array<bool>) =>
+    value.map<bool>((v: bool) => !v)
   );
 }
 

diff --git a/test/test.js b/test/test.js
@@ -278,7 +278,7 @@ describe("asbind", () => {
       assert.equal(arrayMapResponse[0], BigInt(2));
     });
 
-    it(`should handle array of String`, () => {
+    it(`should handle array of string`, () => {
       const array = ["a", "b", "c"];
       const arrayMapResponse = asbindInstance.exports["mapStringArray"](array);
 
@@ -289,6 +289,17 @@ describe("asbind", () => {
       assert.equal(arrayMapResponse[0], "#a");
     });
 
+    it(`should handle array of bool`, () => {
+      const array = [true, false, true];
+      const arrayMapResponse = asbindInstance.exports["mapBoolArray"](array);
+
+      // Ensure it is a type array
+      assert.equal(Array.isArray(arrayMapResponse), true);
+
+      // Ensure it has the correct values
+      assert.equal(arrayMapResponse[0], false);
+    });
+
     it(`should handle array of array of i32`, () => {
       const array = [[1], [2, 3], [4]];
       const arrayMapResponse = asbindInstance.exports["mapI32ArrayArray"](
@@ -315,7 +326,7 @@ describe("asbind", () => {
       assert.equal(arrayMapResponse[1][0], BigInt(4));
     });
 
-    it(`should handle array of array of String`, () => {
+    it(`should handle array of array of string`, () => {
       const array = [["a"], ["b", "c"], ["d"]];
       const arrayMapResponse = asbindInstance.exports["mapStringArrayArray"](
         array
@@ -327,6 +338,19 @@ describe("asbind", () => {
       // Ensure it has the correct values
       assert.equal(arrayMapResponse[1][0], "#b");
     });
+
+    it(`should handle array of array of bool`, () => {
+      const array = [[true], [false, true], [false]];
+      const arrayMapResponse = asbindInstance.exports["mapBoolArrayArray"](
+        array
+      );
+
+      // Ensure it is a type array
+      assert.equal(Array.isArray(arrayMapResponse), true);
+
+      // Ensure it has the correct values
+      assert.equal(arrayMapResponse[1][0], true);
+    });
   });
 
   describe("importObject functions", () => {