diff --git a/types/pidusage/index.d.ts b/types/pidusage/index.d.ts index d21fca3d7f..b16dada0ef 100644 --- a/types/pidusage/index.d.ts +++ b/types/pidusage/index.d.ts @@ -5,13 +5,14 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 -declare function pidusage(pid: number | string, callback: (err: Error | null, stats: pidusage.Stat) => void): void; -declare function pidusage(pids: Array, callback: (err: Error | null, stats: { [key: string]: pidusage.Stat }) => void): void; -declare function pidusage(pid: number | string): Promise; -declare function pidusage(pids: Array): Promise<{ [key: string]: pidusage.Stat }>; +declare function pidusage(pid: number | string, callback: (err: Error | null, stats: Stat) => void): void; +declare function pidusage(pids: Array, callback: (err: Error | null, stats: { [key: string]: Stat }) => void): void; +declare function pidusage(pid: number | string): Promise; +declare function pidusage(pids: Array): Promise<{ [key: string]: Stat }>; -declare namespace pidusage { - interface Stat { +export default pidusage; + +export interface Stat { /** * percentage (from 0 to 100*vcore) */ @@ -47,6 +48,3 @@ declare namespace pidusage { */ timestamp: number; } -} - -export = pidusage; diff --git a/types/pidusage/pidusage-tests.ts b/types/pidusage/pidusage-tests.ts index 37b5715eed..614569dfa3 100644 --- a/types/pidusage/pidusage-tests.ts +++ b/types/pidusage/pidusage-tests.ts @@ -1,4 +1,4 @@ -import * as pidusage from 'pidusage'; +import pidusage, { Stat } from 'pidusage'; let cpu: number; let memory: number; @@ -8,7 +8,7 @@ let ctime: number; let elapsed: number; let timestamp: number; -pidusage(1, (err: Error | null, stats: pidusage.Stat) => { +pidusage(1, (err: Error | null, stats: Stat) => { cpu = stats.cpu; memory = stats.memory; ppid = stats.ppid; @@ -18,7 +18,7 @@ pidusage(1, (err: Error | null, stats: pidusage.Stat) => { timestamp = stats.timestamp; }); -pidusage('two', (err: Error | null, stats: pidusage.Stat) => { +pidusage('two', (err: Error | null, stats: Stat) => { cpu = stats.cpu; memory = stats.memory; ppid = stats.ppid; @@ -28,11 +28,11 @@ pidusage('two', (err: Error | null, stats: pidusage.Stat) => { timestamp = stats.timestamp; }); -pidusage([1, 'two'], (err: Error | null, stats: { [key: string]: pidusage.Stat }) => { - const one: pidusage.Stat = stats[1]; - const two: pidusage.Stat = stats.two; +pidusage([1, 'two'], (err: Error | null, stats: { [key: string]: Stat }) => { + const one: Stat = stats[1]; + const two: Stat = stats.two; }); -const stats_1: Promise = pidusage(1); -const stats_two: Promise = pidusage('two'); -const stats_obj: Promise<{ [key: string]: pidusage.Stat }> = pidusage([1, 'two']); +const stats_1: Promise = pidusage(1); +const stats_two: Promise = pidusage('two'); +const stats_obj: Promise<{ [key: string]: Stat }> = pidusage([1, 'two']);