From 4156318481776e6e11e6947b2744b00f8e5cb19a Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Tue, 20 Dec 2016 08:00:23 -0800 Subject: [PATCH 1/2] Move "_debugger" types into "node" --- _debugger/_debugger-tests.ts | 9 --- _debugger/index.d.ts | 135 ----------------------------------- _debugger/tsconfig.json | 20 ------ node/index.d.ts | 127 ++++++++++++++++++++++++++++++++ node/node-tests.ts | 14 +++- 5 files changed, 140 insertions(+), 165 deletions(-) delete mode 100644 _debugger/_debugger-tests.ts delete mode 100644 _debugger/index.d.ts delete mode 100644 _debugger/tsconfig.json diff --git a/_debugger/_debugger-tests.ts b/_debugger/_debugger-tests.ts deleted file mode 100644 index a44777bd9e..0000000000 --- a/_debugger/_debugger-tests.ts +++ /dev/null @@ -1,9 +0,0 @@ -import _debugger = require("_debugger"); -var {Client} = _debugger; - -var client = new Client(); - -client.connect(8888, 'localhost'); -client.listbreakpoints((err, res) => { - -}); diff --git a/_debugger/index.d.ts b/_debugger/index.d.ts deleted file mode 100644 index 324a875eba..0000000000 --- a/_debugger/index.d.ts +++ /dev/null @@ -1,135 +0,0 @@ -// Type definitions for Node.js debugger API -// Project: http://nodejs.org/ -// Definitions by: Basarat Ali Syed -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -/// - -declare namespace NodeJS { - export module _debugger { - export interface Packet { - raw: string; - headers: string[]; - body: Message; - } - - export interface Message { - seq: number; - type: string; - } - - export interface RequestInfo { - command: string; - arguments: any; - } - - export interface Request extends Message, RequestInfo { - } - - export interface Event extends Message { - event: string; - body?: any; - } - - export interface Response extends Message { - request_seq: number; - success: boolean; - /** Contains error message if success === false. */ - message?: string; - /** Contains message body if success === true. */ - body?: any; - } - - export interface BreakpointMessageBody { - type: string; - target: number; - line: number; - } - - export class Protocol { - res: Packet; - state: string; - execute(data: string): void; - serialize(rq: Request): string; - onResponse: (pkt: Packet) => void; - } - - export var NO_FRAME: number; - export var port: number; - - export interface ScriptDesc { - name: string; - id: number; - isNative?: boolean; - handle?: number; - type: string; - lineOffset?: number; - columnOffset?: number; - lineCount?: number; - } - - export interface Breakpoint { - id: number; - scriptId: number; - script: ScriptDesc; - line: number; - condition?: string; - scriptReq?: string; - } - - export interface RequestHandler { - (err: boolean, body: Message, res: Packet): void; - request_seq?: number; - } - - export interface ResponseBodyHandler { - (err: boolean, body?: any): void; - request_seq?: number; - } - - export interface ExceptionInfo { - text: string; - } - - export interface BreakResponse { - script?: ScriptDesc; - exception?: ExceptionInfo; - sourceLine: number; - sourceLineText: string; - sourceColumn: number; - } - - export function SourceInfo(body: BreakResponse): string; - - export interface ClientInstance extends EventEmitter { - protocol: Protocol; - scripts: ScriptDesc[]; - handles: ScriptDesc[]; - breakpoints: Breakpoint[]; - currentSourceLine: number; - currentSourceColumn: number; - currentSourceLineText: string; - currentFrame: number; - currentScript: string; - - connect(port: number, host: string): void; - req(req: any, cb: RequestHandler): void; - reqFrameEval(code: string, frame: number, cb: RequestHandler): void; - mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void; - setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void; - clearBreakpoint(rq: Request, cb: RequestHandler): void; - listbreakpoints(cb: RequestHandler): void; - reqSource(from: number, to: number, cb: RequestHandler): void; - reqScripts(cb: any): void; - reqContinue(cb: RequestHandler): void; - } - - export var Client : { - new (): ClientInstance - } - } -} - -declare module "_debugger"{ - export = NodeJS._debugger; -} diff --git a/_debugger/tsconfig.json b/_debugger/tsconfig.json deleted file mode 100644 index 4b628b9166..0000000000 --- a/_debugger/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "target": "es6", - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": false, - "baseUrl": "../", - "typeRoots": [ - "../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "_debugger-tests.ts" - ] -} \ No newline at end of file diff --git a/node/index.d.ts b/node/index.d.ts index a428c3a6ad..02f30cc355 100644 --- a/node/index.d.ts +++ b/node/index.d.ts @@ -3972,3 +3972,130 @@ declare module "timers" { declare module "console" { export = console; } + +/** + * _debugger module is not documented. + * Source code is at https://github.com/nodejs/node/blob/master/lib/_debugger.js + */ +declare module "_debugger" { + export interface Packet { + raw: string; + headers: string[]; + body: Message; + } + + export interface Message { + seq: number; + type: string; + } + + export interface RequestInfo { + command: string; + arguments: any; + } + + export interface Request extends Message, RequestInfo { + } + + export interface Event extends Message { + event: string; + body?: any; + } + + export interface Response extends Message { + request_seq: number; + success: boolean; + /** Contains error message if success === false. */ + message?: string; + /** Contains message body if success === true. */ + body?: any; + } + + export interface BreakpointMessageBody { + type: string; + target: number; + line: number; + } + + export class Protocol { + res: Packet; + state: string; + execute(data: string): void; + serialize(rq: Request): string; + onResponse: (pkt: Packet) => void; + } + + export var NO_FRAME: number; + export var port: number; + + export interface ScriptDesc { + name: string; + id: number; + isNative?: boolean; + handle?: number; + type: string; + lineOffset?: number; + columnOffset?: number; + lineCount?: number; + } + + export interface Breakpoint { + id: number; + scriptId: number; + script: ScriptDesc; + line: number; + condition?: string; + scriptReq?: string; + } + + export interface RequestHandler { + (err: boolean, body: Message, res: Packet): void; + request_seq?: number; + } + + export interface ResponseBodyHandler { + (err: boolean, body?: any): void; + request_seq?: number; + } + + export interface ExceptionInfo { + text: string; + } + + export interface BreakResponse { + script?: ScriptDesc; + exception?: ExceptionInfo; + sourceLine: number; + sourceLineText: string; + sourceColumn: number; + } + + export function SourceInfo(body: BreakResponse): string; + + export interface ClientInstance extends NodeJS.EventEmitter { + protocol: Protocol; + scripts: ScriptDesc[]; + handles: ScriptDesc[]; + breakpoints: Breakpoint[]; + currentSourceLine: number; + currentSourceColumn: number; + currentSourceLineText: string; + currentFrame: number; + currentScript: string; + + connect(port: number, host: string): void; + req(req: any, cb: RequestHandler): void; + reqFrameEval(code: string, frame: number, cb: RequestHandler): void; + mirrorObject(obj: any, depth: number, cb: ResponseBodyHandler): void; + setBreakpoint(rq: BreakpointMessageBody, cb: RequestHandler): void; + clearBreakpoint(rq: Request, cb: RequestHandler): void; + listbreakpoints(cb: RequestHandler): void; + reqSource(from: number, to: number, cb: RequestHandler): void; + reqScripts(cb: any): void; + reqContinue(cb: RequestHandler): void; + } + + export var Client : { + new (): ClientInstance + } +} diff --git a/node/node-tests.ts b/node/node-tests.ts index ae1d6f2a5e..ab6b9e0bce 100644 --- a/node/node-tests.ts +++ b/node/node-tests.ts @@ -1,4 +1,3 @@ -/// import * as assert from "assert"; import * as fs from "fs"; import * as events from "events"; @@ -2068,3 +2067,16 @@ namespace constants_tests { str = constants.defaultCoreCipherList str = constants.defaultCipherList } + +/////////////////////////////////////////////////////////// +/// Debugger Tests /// +/////////////////////////////////////////////////////////// + +import { Client } from "_debugger"; + +var client = new Client(); + +client.connect(8888, 'localhost'); +client.listbreakpoints((err, body, packet) => { + +}); From ac007c5e0b6caf994e491217f39ce4f14f530f84 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Tue, 20 Dec 2016 11:53:13 -0800 Subject: [PATCH 2/2] Remove wrong type reference in cbor-tests; it can use the "assert" from "node" instead. --- cbor/cbor-tests.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/cbor/cbor-tests.ts b/cbor/cbor-tests.ts index 4fb153956a..e1a7abb9cf 100644 --- a/cbor/cbor-tests.ts +++ b/cbor/cbor-tests.ts @@ -1,4 +1,3 @@ -/// /// import cbor = require('cbor');