From 993265faef949dadedb12a4cce7e0b39197b44e7 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 1 Mar 2018 14:21:25 -0800 Subject: [PATCH 1/2] Correct 'recluster' to a CJS 'export ='-style declaration. --- types/recluster/index.d.ts | 73 ++++++++++++++++-------------- types/recluster/recluster-tests.ts | 4 +- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/types/recluster/index.d.ts b/types/recluster/index.d.ts index 71d198b8f5..598aeed645 100644 --- a/types/recluster/index.d.ts +++ b/types/recluster/index.d.ts @@ -7,40 +7,43 @@ import { ChildProcess } from "child_process"; -export interface LogOptions { - respawns?: boolean; +declare namespace recluster { + export interface LogOptions { + respawns?: boolean; + } + + export interface Logger { + log(message?: any, ...optionalParams: any[]): void; + } + + export interface BalancerOptions { + /** number of active workers */ + workers?: number; + /** kill timeout for old workers after reload (sec) */ + timeout?: number; + /** min time between respawns when workers die */ + respawn?: number; + /** max time between respawns when workers die */ + backoff?: number; + /** when does the worker become ready? 'listening' or 'started' */ + readyWhen?: string; + /** arguments to pass to the worker (default: []) */ + args?: string[]; + /** what to log to stdout (default: {respawns: true}) */ + log?: LogOptions; + /** logger to use, needs `log` method (default: console) */ + logger?: Logger; + } + + export class Balancer { + constructor(file: string, options: BalancerOptions); + run(): void; + reload(cb?: () => void): void; + stop(): void; + workers(): ChildProcess[]; + activeWorkers(): ChildProcess[]; + } } -export interface Logger { - log(message?: any, ...optionalParams: any[]): void; -} - -export interface BalancerOptions { - /** number of active workers */ - workers?: number; - /** kill timeout for old workers after reload (sec) */ - timeout?: number; - /** min time between respawns when workers die */ - respawn?: number; - /** max time between respawns when workers die */ - backoff?: number; - /** when does the worker become ready? 'listening' or 'started' */ - readyWhen?: string; - /** arguments to pass to the worker (default: []) */ - args?: string[]; - /** what to log to stdout (default: {respawns: true}) */ - log?: LogOptions; - /** logger to use, needs `log` method (default: console) */ - logger?: Logger; -} - -export class Balancer { - constructor(file: string, options: BalancerOptions); - run(): void; - reload(cb?: () => void): void; - stop(): void; - workers(): ChildProcess[]; - activeWorkers(): ChildProcess[]; -} - -export default function recluster(file: string, options?: BalancerOptions): Balancer; +declare function recluster(file: string, options?: recluster.BalancerOptions): recluster.Balancer; +export = recluster; diff --git a/types/recluster/recluster-tests.ts b/types/recluster/recluster-tests.ts index b2641f03ff..62c5f153cd 100644 --- a/types/recluster/recluster-tests.ts +++ b/types/recluster/recluster-tests.ts @@ -1,5 +1,5 @@ -import recluster from "recluster"; -import path = require("path"); +import recluster = require('recluster'); +import path = require('path'); const cluster = recluster(path.join(__dirname, 'server.js')); cluster.run(); From 6f2d2f068ea5ba1815e379713ef60ac8175b3f95 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 2 Mar 2018 00:17:04 -0800 Subject: [PATCH 2/2] Ragga fragga export keywords. --- types/recluster/index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/recluster/index.d.ts b/types/recluster/index.d.ts index 598aeed645..5333b02581 100644 --- a/types/recluster/index.d.ts +++ b/types/recluster/index.d.ts @@ -8,15 +8,15 @@ import { ChildProcess } from "child_process"; declare namespace recluster { - export interface LogOptions { + interface LogOptions { respawns?: boolean; } - export interface Logger { + interface Logger { log(message?: any, ...optionalParams: any[]): void; } - export interface BalancerOptions { + interface BalancerOptions { /** number of active workers */ workers?: number; /** kill timeout for old workers after reload (sec) */ @@ -35,7 +35,7 @@ declare namespace recluster { logger?: Logger; } - export class Balancer { + class Balancer { constructor(file: string, options: BalancerOptions); run(): void; reload(cb?: () => void): void;