From 2e4a63b9c142da96f31e174fe9305a5ec39ec3a4 Mon Sep 17 00:00:00 2001 From: Francis Gulotta Date: Wed, 10 Oct 2018 00:27:41 -0400 Subject: [PATCH] Add constructor options and new method (#29460) --- types/bl/bl-tests.ts | 20 +++++++++++++++++--- types/bl/index.d.ts | 10 ++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/types/bl/bl-tests.ts b/types/bl/bl-tests.ts index 084cf1925a..68fbc79279 100644 --- a/types/bl/bl-tests.ts +++ b/types/bl/bl-tests.ts @@ -9,16 +9,27 @@ var str: string; var noAssert: boolean; bl = new BufferList(); +bl = new BufferList(bl); +bl = new BufferList([bl]); +bl = new BufferList(Buffer.from('asdf')); +bl = new BufferList([Buffer.from('asdf')]); +bl = new BufferList('hi'); bl = new BufferList((err:Error, buffer:Buffer) => { - + if (err) { + throw err; + } + console.log(buffer.toString()); }); bl.append(buffer); +num = bl.length; + num = bl.get(num); buffer = bl.slice(num, num); buffer = bl.slice(num); buffer = bl.slice(); +bl.shallowSlice(0, 1).shallowSlice(); bl.copy(buffer, num, num, num); bl.copy(buffer, num, num); @@ -34,8 +45,11 @@ str = bl.toString(str, num, num); str = bl.toString(str, num); str = bl.toString(str); str = bl.toString(); - -num = bl.length; +bl.indexOf('foo', 0, 'hex') === 1; +bl.indexOf(Buffer.from('foo')) === 1; +bl.indexOf(4) === 1; +bl.indexOf(bl) === 1; +bl.indexOf(new Uint8Array([1,3,4])) === 2; num = bl.readDoubleBE(offset, noAssert); num = bl.readDoubleBE(offset); diff --git a/types/bl/index.d.ts b/types/bl/index.d.ts index 8ad01671fd..8bd9e96aac 100644 --- a/types/bl/index.d.ts +++ b/types/bl/index.d.ts @@ -1,6 +1,7 @@ -// Type definitions for BufferList v0.8.0 +// Type definitions for BufferList v2.1.0 // Project: https://github.com/rvagg/bl // Definitions by: Bart van der Schoor +// Francis Gulotta // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// @@ -9,17 +10,18 @@ import stream = require('stream'); declare class BufferList extends stream.Duplex { - constructor(callback?: (err: Error, buffer: Buffer) => void); + constructor(callbackOrData?: ((err: Error, buffer: Buffer) => void) | Buffer | Buffer[] | BufferList | BufferList[] | string); + length: number; append(buffer: Buffer | Buffer[] | BufferList | BufferList[] | string): void; get(index: number): number; slice(start?: number, end?: number): Buffer; + shallowSlice(start?: number, end?: number): BufferList; copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void; duplicate(): BufferList; consume(bytes?: number): void; toString(encoding?: string, start?: number, end?: number): string; - length: number; - + indexOf(value: string | number | Uint8Array | BufferList | Buffer, byteOffset?: number, encoding?: string): number; readDoubleBE(offset: number, noAssert?: boolean): number; readDoubleLE(offset: number, noAssert?: boolean): number; readFloatBE(offset: number, noAssert?: boolean): number;