From c4e76c862663d7d6646cd24068cbdc05d6161101 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 6 Jan 2019 19:41:15 +0100 Subject: [PATCH 01/13] Update index.d.ts fixed typescript compilation issue --- types/debug/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index 2eca1c8fb8..a03d5cd988 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -6,7 +6,7 @@ // Brasten Sager // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare var debug: debug.IDebug; +declare var debug: debug.IDebug & {debug:debug.IDebug, default:debug.IDebug}; export = debug; export as namespace debug; From 43f9cfc7f19576a637561ca27eb7e0aaa6f74125 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Mon, 7 Jan 2019 10:51:47 +0100 Subject: [PATCH 02/13] fixed coding convention --- types/debug/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index a03d5cd988..e8cfac264b 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -6,7 +6,7 @@ // Brasten Sager // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare var debug: debug.IDebug & {debug:debug.IDebug, default:debug.IDebug}; +declare var debug: debug.IDebug & {debug: debug.IDebug, default: debug.IDebug}; export = debug; export as namespace debug; From 4657145fda72194ffe641ac0042acfd884190a5a Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Wed, 16 Jan 2019 10:37:51 +0100 Subject: [PATCH 03/13] fixed header --- types/debug/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index e8cfac264b..ad37e702a0 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -1,9 +1,10 @@ -// Type definitions for debug +// Type definitions for debug 4.1 // Project: https://github.com/visionmedia/debug // Definitions by: Seon-Wook Park // Gal Talmor // John McLaughlin // Brasten Sager +// Nicolas Penin // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped declare var debug: debug.IDebug & {debug: debug.IDebug, default: debug.IDebug}; From f88076efc7f0ac3290bb7075a6ed1c6a2f4bedf2 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Wed, 16 Jan 2019 10:39:08 +0100 Subject: [PATCH 04/13] disabled rules --- types/debug/tslint.json | 78 +---------------------------------------- 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/types/debug/tslint.json b/types/debug/tslint.json index a41bf5d19a..f93cf8562a 100644 --- a/types/debug/tslint.json +++ b/types/debug/tslint.json @@ -1,79 +1,3 @@ { - "extends": "dtslint/dt.json", - "rules": { - "adjacent-overload-signatures": false, - "array-type": false, - "arrow-return-shorthand": false, - "ban-types": false, - "callable-types": false, - "comment-format": false, - "dt-header": false, - "eofline": false, - "export-just-namespace": false, - "import-spacing": false, - "interface-name": false, - "interface-over-type-literal": false, - "jsdoc-format": false, - "max-line-length": false, - "member-access": false, - "new-parens": false, - "no-any-union": false, - "no-boolean-literal-compare": false, - "no-conditional-assignment": false, - "no-consecutive-blank-lines": false, - "no-construct": false, - "no-declare-current-package": false, - "no-duplicate-imports": false, - "no-duplicate-variable": false, - "no-empty-interface": false, - "no-for-in-array": false, - "no-inferrable-types": false, - "no-internal-module": false, - "no-irregular-whitespace": false, - "no-mergeable-namespace": false, - "no-misused-new": false, - "no-namespace": false, - "no-object-literal-type-assertion": false, - "no-padding": false, - "no-redundant-jsdoc": false, - "no-redundant-jsdoc-2": false, - "no-redundant-undefined": false, - "no-reference-import": false, - "no-relative-import-in-test": false, - "no-self-import": false, - "no-single-declare-module": false, - "no-string-throw": false, - "no-unnecessary-callback-wrapper": false, - "no-unnecessary-class": false, - "no-unnecessary-generics": false, - "no-unnecessary-qualifier": false, - "no-unnecessary-type-assertion": false, - "no-useless-files": false, - "no-var-keyword": false, - "no-var-requires": false, - "no-void-expression": false, - "no-trailing-whitespace": false, - "object-literal-key-quotes": false, - "object-literal-shorthand": false, - "one-line": false, - "one-variable-per-declaration": false, - "only-arrow-functions": false, - "prefer-conditional-expression": false, - "prefer-const": false, - "prefer-declare-function": false, - "prefer-for-of": false, - "prefer-method-signature": false, - "prefer-template": false, - "radix": false, - "semicolon": false, - "space-before-function-paren": false, - "space-within-parens": false, - "strict-export-declare-modifiers": false, - "trim-file": false, - "triple-equals": false, - "typedef-whitespace": false, - "unified-signatures": false, - "void-return": false, - "whitespace": false - } + "extends": "dtslint/dt.json" } From c2ce3512058edf773a51c0c58a1f2f777b128d2a Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 10:41:49 +0100 Subject: [PATCH 05/13] Update debug-tests.ts fixed tslint issues --- types/debug/debug-tests.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/types/debug/debug-tests.ts b/types/debug/debug-tests.ts index bad51ed584..ddfd698825 100644 --- a/types/debug/debug-tests.ts +++ b/types/debug/debug-tests.ts @@ -1,11 +1,9 @@ - - import debug = require("debug"); debug.disable(); debug.enable("DefinitelyTyped:*"); -var log:debug.IDebugger = debug("DefinitelyTyped:log"); +const log: debug.IDebugger = debug("DefinitelyTyped:log"); log("Just text"); log("Formatted test (%d arg)", 1); @@ -15,12 +13,12 @@ log("Enabled?: %s", debug.enabled("DefinitelyTyped:log")); log("Name Enabled: %s", debug.names.some(name => name.test("DefinitelyTyped:log"))); log("Namespace: %s", log.namespace); -var error:debug.IDebugger = debug("DefinitelyTyped:error"); +const error: debug.IDebugger = debug("DefinitelyTyped:error"); error.log = console.error.bind(console); error("This should be printed to stderr"); -var extendedLog: debug.IDebugger = log.extend('extended'); +const extendedLog: debug.IDebugger = log.extend('extended'); extendedLog("Testing this is also an IDebugger."); -var extendedWithCustomDelimiter: debug.IDebugger = log.extend('with-delim', '.'); -extendedWithCustomDelimiter("Testing this is an IDebugger, too."); \ No newline at end of file +const extendedWithCustomDelimiter: debug.IDebugger = log.extend('with-delim', '.'); +extendedWithCustomDelimiter("Testing this is an IDebugger, too."); From 99c9aff07f708e974a0e9ade9a7457682f0a13b1 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 10:50:23 +0100 Subject: [PATCH 06/13] Update index.d.ts --- types/debug/index.d.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index ad37e702a0..9d6814cf9a 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -13,29 +13,29 @@ export = debug; export as namespace debug; declare namespace debug { - export interface IDebug { - (namespace: string): debug.IDebugger, - coerce: (val: any) => any, - disable: () => void, - enable: (namespaces: string) => void, - enabled: (namespaces: string) => boolean, + interface Debug { + (namespace: string): debug.Debugger; + coerce: (val: any) => any; + disable: () => void; + enable: (namespaces: string) => void; + enabled: (namespaces: string) => boolean; - names: RegExp[], - skips: RegExp[], + names: RegExp[]; + skips: RegExp[]; - formatters: IFormatters + formatters: Formatters; } - export interface IFormatters { - [formatter: string]: Function + interface Formatters { + [formatter: string]: (v:Object)=>string; } - export interface IDebugger { + interface Debugger { (formatter: any, ...args: any[]): void; enabled: boolean; log: Function; namespace: string; - extend: (namespace: string, delimiter?: string) => debug.IDebugger; + extend: (namespace: string, delimiter?: string) => debug.Debugger; } } From 753941216112d4f4cdb0280ff6c444f1a97dd692 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 11:26:13 +0100 Subject: [PATCH 07/13] Update index.d.ts --- types/debug/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index 9d6814cf9a..ccc2c363af 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -7,7 +7,7 @@ // Nicolas Penin // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare var debug: debug.IDebug & {debug: debug.IDebug, default: debug.IDebug}; +declare var debug: debug.Debug & {debug: debug.Debug, default: debug.Debug}; export = debug; export as namespace debug; From 2943797f768de0d4e9a9f486e9fae11fad778f70 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 11:27:07 +0100 Subject: [PATCH 08/13] Update debug-tests.ts --- types/debug/debug-tests.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/debug/debug-tests.ts b/types/debug/debug-tests.ts index ddfd698825..22ac083a14 100644 --- a/types/debug/debug-tests.ts +++ b/types/debug/debug-tests.ts @@ -3,7 +3,7 @@ import debug = require("debug"); debug.disable(); debug.enable("DefinitelyTyped:*"); -const log: debug.IDebugger = debug("DefinitelyTyped:log"); +const log: debug.Debugger = debug("DefinitelyTyped:log"); log("Just text"); log("Formatted test (%d arg)", 1); @@ -13,12 +13,12 @@ log("Enabled?: %s", debug.enabled("DefinitelyTyped:log")); log("Name Enabled: %s", debug.names.some(name => name.test("DefinitelyTyped:log"))); log("Namespace: %s", log.namespace); -const error: debug.IDebugger = debug("DefinitelyTyped:error"); +const error: debug.Debugger = debug("DefinitelyTyped:error"); error.log = console.error.bind(console); error("This should be printed to stderr"); -const extendedLog: debug.IDebugger = log.extend('extended'); +const extendedLog: debug.Debugger = log.extend('extended'); extendedLog("Testing this is also an IDebugger."); -const extendedWithCustomDelimiter: debug.IDebugger = log.extend('with-delim', '.'); +const extendedWithCustomDelimiter: debug.Debugger = log.extend('with-delim', '.'); extendedWithCustomDelimiter("Testing this is an IDebugger, too."); From ca16f6f8441cfd7ac63fb7a2a1f614fbddc56f07 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 11:38:11 +0100 Subject: [PATCH 09/13] Update index.d.ts --- types/debug/index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index ccc2c363af..7b4e44dbdd 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -14,7 +14,7 @@ export as namespace debug; declare namespace debug { interface Debug { - (namespace: string): debug.Debugger; + (namespace: string): Debugger; coerce: (val: any) => any; disable: () => void; enable: (namespaces: string) => void; @@ -27,15 +27,15 @@ declare namespace debug { } interface Formatters { - [formatter: string]: (v:Object)=>string; + [formatter: string]: (v: any) => string; } interface Debugger { (formatter: any, ...args: any[]): void; enabled: boolean; - log: Function; + log: (v: any) => string; namespace: string; - extend: (namespace: string, delimiter?: string) => debug.Debugger; + extend: (namespace: string, delimiter?: string) => Debugger; } } From 0d2ae95d00b95dd3931255ee67d866beb67f6ccb Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 11:44:16 +0100 Subject: [PATCH 10/13] Update index.d.ts fixed backward compatibility --- types/debug/index.d.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index 7b4e44dbdd..3dc8d32774 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -25,10 +25,14 @@ declare namespace debug { formatters: Formatters; } + + type IDebug=Debug; interface Formatters { [formatter: string]: (v: any) => string; } + + type IDebugger=Debugger; interface Debugger { (formatter: any, ...args: any[]): void; From 01925c6c8bd763e757ae3fd867a06cf21ab0a24f Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Sun, 27 Jan 2019 11:49:04 +0100 Subject: [PATCH 11/13] Update index.d.ts --- types/debug/index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/debug/index.d.ts b/types/debug/index.d.ts index 3dc8d32774..2067b27222 100644 --- a/types/debug/index.d.ts +++ b/types/debug/index.d.ts @@ -25,14 +25,14 @@ declare namespace debug { formatters: Formatters; } - - type IDebug=Debug; + + type IDebug = Debug; interface Formatters { [formatter: string]: (v: any) => string; } - - type IDebugger=Debugger; + + type IDebugger = Debugger; interface Debugger { (formatter: any, ...args: any[]): void; From 5fd8f52edf25db7a902cd13658b8b47472fa0df1 Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Tue, 29 Jan 2019 07:05:37 +0100 Subject: [PATCH 12/13] added tests for default import --- types/debug/debug-tests.ts | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/types/debug/debug-tests.ts b/types/debug/debug-tests.ts index 22ac083a14..b1356f08f9 100644 --- a/types/debug/debug-tests.ts +++ b/types/debug/debug-tests.ts @@ -1,24 +1,31 @@ -import debug = require("debug"); +import * as debug1 from "debug"; -debug.disable(); -debug.enable("DefinitelyTyped:*"); +import debug2 from 'debug'; -const log: debug.Debugger = debug("DefinitelyTyped:log"); +const log2:debug1.Debugger = debug2("DefinitelyTyped:log"); +log2("Just text"); +log2("Formatted test (%d arg)", 1); +log2("Formatted %s (%d args)", "test", 2); + +debug1.disable(); +debug1.enable("DefinitelyTyped:*"); + +const log: debug1.Debugger = debug1("DefinitelyTyped:log"); log("Just text"); log("Formatted test (%d arg)", 1); log("Formatted %s (%d args)", "test", 2); -log("Enabled?: %s", debug.enabled("DefinitelyTyped:log")); -log("Name Enabled: %s", debug.names.some(name => name.test("DefinitelyTyped:log"))); +log("Enabled?: %s", debug1.enabled("DefinitelyTyped:log")); +log("Name Enabled: %s", debug1.names.some(name => name.test("DefinitelyTyped:log"))); log("Namespace: %s", log.namespace); -const error: debug.Debugger = debug("DefinitelyTyped:error"); +const error: debug1.Debugger = debug1("DefinitelyTyped:error"); error.log = console.error.bind(console); error("This should be printed to stderr"); -const extendedLog: debug.Debugger = log.extend('extended'); +const extendedLog: debug1.Debugger = log.extend('extended'); extendedLog("Testing this is also an IDebugger."); -const extendedWithCustomDelimiter: debug.Debugger = log.extend('with-delim', '.'); +const extendedWithCustomDelimiter: debug1.Debugger = log.extend('with-delim', '.'); extendedWithCustomDelimiter("Testing this is an IDebugger, too."); From 86ed80563e7a0256cabe7162f78624013443820e Mon Sep 17 00:00:00 2001 From: Nicolas Penin Date: Tue, 29 Jan 2019 11:10:47 +0100 Subject: [PATCH 13/13] fixed tslint issues --- types/debug/debug-tests.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/debug/debug-tests.ts b/types/debug/debug-tests.ts index b1356f08f9..92d6f5eb8e 100644 --- a/types/debug/debug-tests.ts +++ b/types/debug/debug-tests.ts @@ -1,8 +1,8 @@ import * as debug1 from "debug"; - +/*tslint:disable-next-line:no-duplicate-imports*/ import debug2 from 'debug'; -const log2:debug1.Debugger = debug2("DefinitelyTyped:log"); +const log2: debug1.Debugger = debug2("DefinitelyTyped:log"); log2("Just text"); log2("Formatted test (%d arg)", 1); log2("Formatted %s (%d args)", "test", 2);