Merge branch 'master' into NodeJS.EventEmitter.6

node/node-4.d.ts

@@ -290,6 +290,7 @@ declare namespace NodeJS {
         cwd(): string;
         env: any;
         exit(code?: number): void;
+        exitCode: number;
         getgid(): number;
         setgid(id: number): void;
         setgid(id: string): void;

node/node-tests.ts

@@ -259,6 +259,47 @@ function bufferTests() {
         index = buffer.lastIndexOf(buffer);
     }
 
+    {
+        let buffer = new Buffer('123');
+        let val: [number, number];
+
+        for (let entry of buffer.entries()) {
+            val = entry;
+        }
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let includes: boolean;
+        includes = buffer.includes("23");
+        includes = buffer.includes("23", 1);
+        includes = buffer.includes("23", 1, "utf8");
+        includes = buffer.includes(23);
+        includes = buffer.includes(23, 1);
+        includes = buffer.includes(23, 1, "utf8");
+        includes = buffer.includes(buffer);
+        includes = buffer.includes(buffer, 1);
+        includes = buffer.includes(buffer, 1, "utf8");
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        for (let key of buffer.keys()) {
+            val = key;
+        }
+    }
+
+    {
+        let buffer = new Buffer('123');
+        let val: number;
+
+        for (let value of buffer.values()) {
+            val = value;
+        }
+    }
+
     // Imported Buffer from buffer module works properly
     {
         let b = new ImportedBuffer('123');

node/node.d.ts

@@ -509,10 +509,10 @@ interface NodeBuffer extends Uint8Array {
     fill(value: any, offset?: number, end?: number): this;
     indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
     lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-    // TODO: entries
-    // TODO: includes
-    // TODO: keys
-    // TODO: values
+    entries(): IterableIterator<[number, number]>;
+    includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<number>;
 }
 
 /************************************************
@@ -753,7 +753,7 @@ declare module "cluster" {
         id: string;
         process: child.ChildProcess;
         suicide: boolean;
-        send(message: any, sendHandle?: any): void;
+        send(message: any, sendHandle?: any): boolean;
         kill(signal?: string): void;
         destroy(signal?: string): void;
         disconnect(): void;
@@ -1075,7 +1075,7 @@ declare module "child_process" {
         stdio: [stream.Writable, stream.Readable, stream.Readable];
         pid: number;
         kill(signal?: string): void;
-        send(message: any, sendHandle?: any): void;
+        send(message: any, sendHandle?: any): boolean;
         connected: boolean;
         disconnect(): void;
         unref(): void;
@@ -2632,4 +2632,4 @@ declare module "constants" {
 
 declare module "process" {
     export = process;
-}
+}