Merge pull request #13467 from DefinitelyTyped/debugger

Move "_debugger" types into "node"

_debugger/_debugger-tests.ts

@@ -1,9 +0,0 @@
-import _debugger = require("_debugger");
-var {Client} = _debugger;
-
-var client = new Client();
-
-client.connect(8888, 'localhost');
-client.listbreakpoints((err, res) => {
-
-});

_debugger/index.d.ts

@@ -1,135 +0,0 @@
-// Type definitions for Node.js debugger API
-// Project: http://nodejs.org/
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node"/>
-
-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;
-}

_debugger/tsconfig.json

@@ -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"
-    ]
-}

cbor/cbor-tests.ts

@@ -1,4 +1,3 @@
-/// <reference types="assert" />
 /// <reference types="node" />
 
 import cbor = require('cbor');

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
+    }
+}

node/node-tests.ts

@@ -1,4 +1,3 @@
-/// <reference path="index.d.ts" />
 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) => {
+
+});