[Chore] Merge master

jtenner · jtenner · commit fe0cf50b8f1f · 2019-07-23T14:32:10.000-04:00
diff --git a/assembly/buffer/index.ts b/assembly/buffer/index.ts
@@ -27,6 +27,10 @@ export class Buffer extends Uint8Array {
     return result;
   }
 
+  public static isBuffer<T>(value: T): bool {
+    return value instanceof Buffer;
+  }
+
   readUInt8(offset: i32 = 0): u8 {
     if(<u32>offset >= this.dataLength) throw new RangeError(E_INDEXOUTOFRANGE);
     return load<u8>(this.dataStart + usize(offset));
diff --git a/assembly/node.d.ts b/assembly/node.d.ts
@@ -3,6 +3,8 @@ declare class Buffer extends Uint8Array {
   static alloc(size: i32): Buffer;
   /** This method allocates a new Buffer of indicated size. This is unsafe because the data is not zeroed. */
   static allocUnsafe(size: i32): Buffer;
+  /** This method asserts a value is a Buffer object via `value instanceof Buffer`. */
+  static isBuffer<T>(value: T): bool;
   /** Reads an unsigned integer at the designated offset. */
   readUInt8(offset?: i32): u8;
   /** Writes an inputted u8 value to the buffer, at the desired offset. */
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,9 +12,8 @@
     "url": "https://github.com/AssemblyScript/node/issues"
   },
   "devDependencies": {
-    "@as-pect/core": "^2.2.0",
-    "assemblyscript": "github:assemblyscript/assemblyscript#7c775d1bccbe08fec5d820b9d53ae44ff6bd1e49",
-    "diff": "^4.0.1",
+    "@as-pect/core": "^2.3.1",
+    "assemblyscript": "github:assemblyscript/assemblyscript",
     "glob": "^7.1.4",
     "wasi": "github:devsnek/node-wasi"
   },
diff --git a/tests/buffer.spec.ts b/tests/buffer.spec.ts
@@ -28,7 +28,7 @@ describe("buffer", () => {
     expect<Buffer>(Buffer.alloc(10)).toHaveLength(10);
     let buff = Buffer.alloc(100);
     for (let i = 0; i < buff.length; i++) expect<u8>(buff[i]).toBe(0);
-    expect<ArrayBuffer>(buff.buffer).not.toBeNull();
+    expect<ArrayBuffer | null>(buff.buffer).not.toBeNull();
     expect<u32>(buff.byteLength).toBe(100);
     // TODO: expectFn(() => { Buffer.alloc(-1); }).toThrow();
     // TODO: expectFn(() => { Buffer.alloc(BLOCK_MAXSIZE + 1); }).toThrow();
@@ -38,12 +38,27 @@ describe("buffer", () => {
     expect<Buffer>(Buffer.allocUnsafe(10)).toBeTruthy();
     expect<Buffer>(Buffer.allocUnsafe(10)).toHaveLength(10);
     let buff = Buffer.allocUnsafe(100);
-    expect<ArrayBuffer>(buff.buffer).not.toBeNull();
+    expect<ArrayBuffer | null>(buff.buffer).not.toBeNull();
     expect<u32>(buff.byteLength).toBe(100);
     // TODO: expectFn(() => { Buffer.allocUnsafe(-1); }).toThrow();
     // TODO: expectFn(() => { Buffer.allocUnsafe(BLOCK_MAXSIZE + 1); }).toThrow();
   });
 
+  test("#isBuffer", () => {
+    let a = "";
+    let b = new Uint8Array(0);
+    let c = 0;
+    let d = 1.1;
+    let e = new Buffer(0);
+    expect<bool>(Buffer.isBuffer<string>(a)).toBeFalsy();
+    expect<bool>(Buffer.isBuffer<Uint8Array>(b)).toBeFalsy();
+    expect<bool>(Buffer.isBuffer<i32>(c)).toBeFalsy();
+    expect<bool>(Buffer.isBuffer<f64>(d)).toBeFalsy();
+    expect<bool>(Buffer.isBuffer<Buffer>(e)).toBeTruthy();
+    // null checks are done by the compiler explicitly at runtime
+    expect<bool>(Buffer.isBuffer<Buffer | null>(null)).toBeFalsy();
+  });
+
   test("#readUInt8", () => {
     let buff = new Buffer(10);
     buff[0] = -2;
diff --git a/tests/node.js b/tests/node.js
@@ -7,6 +7,7 @@ const path = require("path");
 const fs = require("fs");
 const Wasi = require("wasi");
 const wasi = new Wasi({});
+let pass = true;
 
 const options = parse(process.argv.slice(2), {
   "help": {
@@ -125,4 +126,8 @@ function runTest(file, type, binary, wat) {
   wasi.setMemory(wasm.memory);
   wasi.view = new DataView(wasm.memory.buffer);
   context.run(wasm);
+
+  if (!context.pass) pass = false;
 }
+
+process.exit(pass ? 0 : 1);
