From 1df11ec62acbb554a4d40c390d36b2eb6399223b Mon Sep 17 00:00:00 2001 From: erikma Date: Tue, 4 Jul 2017 18:33:23 -0700 Subject: [PATCH] Fix lint issues: --- types/zeromq/index.d.ts | 78 ++++++++++-------------------------- types/zeromq/tsconfig.json | 4 +- types/zeromq/zeromq-tests.ts | 16 ++++---- 3 files changed, 31 insertions(+), 67 deletions(-) diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts index bc25f1c0d3..d77c48dbf7 100644 --- a/types/zeromq/index.d.ts +++ b/types/zeromq/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for zeromq.js +// Type definitions for zeromq 4.5 // Project: https://github.com/zeromq/zeromq.js // Definitions by: Dave McKeown , Erik Mavrinac // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -9,9 +9,7 @@ /// -interface EventEmitter { } - -interface SocketTypes { +export interface SocketTypes { pub: number; xpub: number; sub: number; @@ -28,7 +26,7 @@ interface SocketTypes { stream: number; } -interface SocketOptions { +export interface SocketOptions { _fd: number; _ioevents: number; _receiveMore: number; @@ -58,36 +56,21 @@ interface SocketOptions { zap_domain: number; } -interface Socket extends EventEmitter { +export interface Socket { /** * Set `opt` to `val`. * * @param opt Option * @param val Value */ - setsocketopt(opt: number, val: any): Socket; - - /** - * Set `opt` to `val`. - * - * @param opt Option - * @param val Value - */ - setsocketopt(opt: string, val: any): Socket; + setsocketopt(opt: number|string, val: any): Socket; /** * Get socket `opt`. * * @param opt Option number */ - getsocketopt(opt: number): any; - - /** - * Get socket `opt`. - * - * @param opt Option string - */ - getsocketopt(opt: string): any; + getsocketopt(opt: number|string): any; /** * Async bind. @@ -157,33 +140,17 @@ interface Socket extends EventEmitter { * @param msg The message * @param flags Message flags */ - send(msg: string, flags?: number): Socket; + send(msg: string|Buffer|any[], flags?: number): Socket; /** - * Send the given `msg`. + * Enable monitoring of a Socket. This enables the following additional events: + * 'connect', 'connect_delay', 'connect_retry', 'listen', 'bind_error', + * 'accept', 'accept_error', 'close', 'close_error', 'disconnect'. + * Each event receives the parameters: (eventValue, eventEndpointAddrress, error) * - * @param msg {Buffer} The message - * @param flags {number} Optional message flags + * @param {Number} timer interval in ms > 0 or Undefined for default + * @return {Socket} for chaining */ - send(msg: Buffer, flags?: number): Socket; - - /** - * Send the given `msg`. - * - * @param msg The message - * @param flags Message flags - */ - send(msg: any[], flags?: number): Socket; - - /** - * Enable monitoring of a Socket. This enables the following additional events: - * 'connect', 'connect_delay', 'connect_retry', 'listen', 'bind_error', - * 'accept', 'accept_error', 'close', 'close_error', 'disconnect'. - * Each event receives the parameters: (eventValue, eventEndpointAddrress, error) - * - * @param {Number} timer interval in ms > 0 or Undefined for default - * @return {Socket} for chaining - */ monitor(interval?: number): Socket; /** @@ -225,17 +192,16 @@ interface Socket extends EventEmitter { plain_server: any; plain_username: any; plain_password: any; - curve_server: any; - curve_publickey: any; - curve_secretkey: any; - curve_serverkey: any; + curve_server: number; + curve_publickey: string | Buffer; + curve_secretkey: string | Buffer; + curve_serverkey: string | Buffer; zap_domain: any; } -export var version: string; -export var types: SocketTypes; -export var options: SocketOptions; +export let version: string; +export let types: SocketTypes; +export let options: SocketOptions; -declare function socket(type: string, options?: any): Socket; -declare function socket(type: number, options?: any): Socket; -declare function createSocket(type: string, options?: any): Socket; +export function socket(type: string|number, options?: any): Socket; +export function createSocket(type: string, options?: any): Socket; diff --git a/types/zeromq/tsconfig.json b/types/zeromq/tsconfig.json index 4899c84d1d..aa30afd4b0 100644 --- a/types/zeromq/tsconfig.json +++ b/types/zeromq/tsconfig.json @@ -6,7 +6,7 @@ ], "noImplicitAny": true, "noImplicitThis": true, - "strictNullChecks": false, + "strictNullChecks": true, "baseUrl": "../", "typeRoots": [ "../" @@ -19,4 +19,4 @@ "index.d.ts", "zeromq-tests.ts" ] -} \ No newline at end of file +} diff --git a/types/zeromq/zeromq-tests.ts b/types/zeromq/zeromq-tests.ts index b13ff65fb5..af36166e64 100644 --- a/types/zeromq/zeromq-tests.ts +++ b/types/zeromq/zeromq-tests.ts @@ -1,29 +1,27 @@ import zeromq = require('zeromq'); function test1() { - var sock = zeromq.socket('push'); + let sock = zeromq.socket('push'); sock.bindSync('tcp://127.0.0.1:3000'); sock.unbindSync('tcp://127.0.0.1:3000'); sock.send("some work"); } function test2() { - var sock = zeromq.socket('push'); + let sock = zeromq.socket('push'); sock.bindSync('tcp://127.0.0.1:3000'); sock.send(new Buffer(1000)); } function test3() { - var sock = zeromq.socket('push'); + let sock = zeromq.socket('push'); sock.bindSync('tcp://127.0.0.1:3000'); sock.send(['hello', 'world']); - sock.on('message', function (buffer1: Buffer, buffer2: Buffer) { - // - }); + sock.on('message', (buffer1: Buffer, buffer2: Buffer) => { }); } function test4() { - var sock = zeromq.socket(zeromq.types.pull); + let sock = zeromq.socket(zeromq.types.pull); sock.bind('tcp://127.0.0.1', err => { sock.send("some work"); }); @@ -33,7 +31,7 @@ function test4() { } function test5() { - var sock = zeromq.socket(zeromq.types.pull, zeromq.options.linger); + let sock = zeromq.socket(zeromq.types.pull, zeromq.options.linger); sock.bind('tcp://127.0.0.1', err => { sock.send("some work"); }); @@ -42,7 +40,7 @@ function test5() { } function test6() { - var sock = zeromq.socket(zeromq.types.dealer); + let sock = zeromq.socket(zeromq.types.dealer); sock.bind('tcp://127.0.0.1', err => { sock.send("some work"); });