Merge pull request #18974 from marcghorayeb/fix/node-zlib-interface

[node] homogenize zlib input to Buffer or string and results to Buffer
This commit is contained in:
Daniel Rosenwasser
2017-08-16 11:33:35 -07:00
committed by GitHub
9 changed files with 132 additions and 68 deletions

30
types/node/index.d.ts vendored
View File

@@ -1278,21 +1278,21 @@ declare module "zlib" {
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gunzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflate(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflateRaw(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function unzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export namespace constants {
// Allowed flush values.

View File

@@ -2820,3 +2820,19 @@ namespace async_hooks_tests {
const tId: number = async_hooks.triggerAsyncId();
const eId: number = async_hooks.executionAsyncId();
}
////////////////////////////////////////////////////
/// zlib tests : http://nodejs.org/api/zlib.html ///
////////////////////////////////////////////////////
namespace zlib_tests {
{
const gzipped = zlib.gzipSync('test');
const unzipped = zlib.gunzipSync(gzipped.toString());
}
{
const deflate = zlib.deflateSync('test');
const inflate = zlib.inflateSync(deflate.toString());
}
}

View File

@@ -664,20 +664,20 @@ declare module "zlib" {
export function createInflateRaw(options?: ZlibOptions): InflateRaw;
export function createUnzip(options?: ZlibOptions): Unzip;
export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void;
export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
// Constants
export var Z_NO_FLUSH: number;

View File

@@ -448,3 +448,19 @@ namespace string_decoder_tests {
childProcess.exec("echo test");
childProcess.spawnSync("echo test");
////////////////////////////////////////////////////
/// zlib tests : http://nodejs.org/api/zlib.html ///
////////////////////////////////////////////////////
namespace zlib_tests {
{
const gzipped = zlib.gzipSync('test');
const unzipped = zlib.gunzipSync(gzipped.toString());
}
{
const deflate = zlib.deflateSync('test');
const inflate = zlib.inflateSync(deflate.toString());
}
}

View File

@@ -802,20 +802,20 @@ declare module "zlib" {
export function createInflateRaw(options?: ZlibOptions): InflateRaw;
export function createUnzip(options?: ZlibOptions): Unzip;
export function deflate(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function deflateSync(buf: Buffer | string, options?: ZlibOptions): any;
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): any;
export function gzip(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): any;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): any;
export function inflate(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): any;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): any;
export function unzip(buf: Buffer | string, callback: (error: Error, result: any) =>void ): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): any;
export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
// Constants
export var Z_NO_FLUSH: number;

View File

@@ -1092,16 +1092,16 @@ declare module "zlib" {
export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
// Constants
export var Z_NO_FLUSH: number;

View File

@@ -2366,3 +2366,19 @@ client.connect(8888, 'localhost');
client.listbreakpoints((err, body, packet) => {
});
////////////////////////////////////////////////////
/// zlib tests : http://nodejs.org/api/zlib.html ///
////////////////////////////////////////////////////
namespace zlib_tests {
{
const gzipped = zlib.gzipSync('test');
const unzipped = zlib.gunzipSync(gzipped.toString());
}
{
const deflate = zlib.deflateSync('test');
const inflate = zlib.inflateSync(deflate.toString());
}
}

View File

@@ -1123,21 +1123,21 @@ declare module "zlib" {
export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function gunzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflate(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function inflateRaw(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
export function unzip(buf: Buffer, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
export function gzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function gunzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function inflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export function unzip(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error, result: Buffer) => void): void;
export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
export namespace constants {
// Allowed flush values.

View File

@@ -2510,3 +2510,19 @@ client.connect(8888, 'localhost');
client.listbreakpoints((err, body, packet) => {
});
////////////////////////////////////////////////////
/// zlib tests : http://nodejs.org/api/zlib.html ///
////////////////////////////////////////////////////
namespace zlib_tests {
{
const gzipped = zlib.gzipSync('test');
const unzipped = zlib.gunzipSync(gzipped.toString());
}
{
const deflate = zlib.deflateSync('test');
const inflate = zlib.inflateSync(deflate.toString());
}
}