From 9beda1efac5d277b370a77b7c7c16bac706af2cf Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 11:47:32 +0500 Subject: [PATCH 1/7] Added type definition for natural-compare --- types/natural-compare-lite/index.d.ts | 14 +++++++++++ .../natural-compare-lite-tests.ts | 10 ++++++++ types/natural-compare-lite/tsconfig.json | 23 +++++++++++++++++++ types/natural-compare-lite/tslint.json | 3 +++ types/natural-compare/index.d.ts | 14 +++++++++++ .../natural-compare/natural-compare-tests.ts | 10 ++++++++ types/natural-compare/tsconfig.json | 23 +++++++++++++++++++ types/natural-compare/tslint.json | 3 +++ 8 files changed, 100 insertions(+) create mode 100644 types/natural-compare-lite/index.d.ts create mode 100644 types/natural-compare-lite/natural-compare-lite-tests.ts create mode 100644 types/natural-compare-lite/tsconfig.json create mode 100644 types/natural-compare-lite/tslint.json create mode 100644 types/natural-compare/index.d.ts create mode 100644 types/natural-compare/natural-compare-tests.ts create mode 100644 types/natural-compare/tsconfig.json create mode 100644 types/natural-compare/tslint.json diff --git a/types/natural-compare-lite/index.d.ts b/types/natural-compare-lite/index.d.ts new file mode 100644 index 0000000000..5e1a10bbdb --- /dev/null +++ b/types/natural-compare-lite/index.d.ts @@ -0,0 +1,14 @@ +// Type definitions for natural-compare-lite 1.4.0 +// Project: https://github.com/litejs/natural-compare-lite +// Definitions by: Doniyor Aliyev +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +declare function naturalCompare(a: string, b: string): number; + +declare global { + interface StringConstructor { + naturalCompare: typeof naturalCompare; + } +} + +export = naturalCompare; diff --git a/types/natural-compare-lite/natural-compare-lite-tests.ts b/types/natural-compare-lite/natural-compare-lite-tests.ts new file mode 100644 index 0000000000..dc483b4bcd --- /dev/null +++ b/types/natural-compare-lite/natural-compare-lite-tests.ts @@ -0,0 +1,10 @@ +// Type definitions for natural-compare-lite 1.4.0 +// Project: https://github.com/litejs/natural-compare-lite +// Definitions by: Doniyor Aliyev +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +import compare = require("natural-compare-lite"); + +['a', 's', 'd'].sort(compare); + +['a', 's', 'd'].sort(String.naturalCompare); diff --git a/types/natural-compare-lite/tsconfig.json b/types/natural-compare-lite/tsconfig.json new file mode 100644 index 0000000000..e3ed3ac1e0 --- /dev/null +++ b/types/natural-compare-lite/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": false, + "strictFunctionTypes": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "natural-compare-lite-tests.ts" + ] +} diff --git a/types/natural-compare-lite/tslint.json b/types/natural-compare-lite/tslint.json new file mode 100644 index 0000000000..f93cf8562a --- /dev/null +++ b/types/natural-compare-lite/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "dtslint/dt.json" +} diff --git a/types/natural-compare/index.d.ts b/types/natural-compare/index.d.ts new file mode 100644 index 0000000000..57e0999157 --- /dev/null +++ b/types/natural-compare/index.d.ts @@ -0,0 +1,14 @@ +// Type definitions for natural-compare 1.4.0 +// Project: https://github.com/litejs/natural-compare-lite +// Definitions by: Doniyor Aliyev +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +declare function naturalCompare(a: string, b: string): number; + +declare global { + interface StringConstructor { + naturalCompare: typeof naturalCompare; + } +} + +export = naturalCompare; diff --git a/types/natural-compare/natural-compare-tests.ts b/types/natural-compare/natural-compare-tests.ts new file mode 100644 index 0000000000..59e7d53163 --- /dev/null +++ b/types/natural-compare/natural-compare-tests.ts @@ -0,0 +1,10 @@ +// Type definitions for natural-compare 1.4.0 +// Project: https://github.com/litejs/natural-compare-lite +// Definitions by: Doniyor Aliyev +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +import compare = require("natural-compare"); + +['a', 's', 'd'].sort(compare); + +['a', 's', 'd'].sort(String.naturalCompare); diff --git a/types/natural-compare/tsconfig.json b/types/natural-compare/tsconfig.json new file mode 100644 index 0000000000..81322d5590 --- /dev/null +++ b/types/natural-compare/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": false, + "strictFunctionTypes": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "natural-compare-tests.ts" + ] +} diff --git a/types/natural-compare/tslint.json b/types/natural-compare/tslint.json new file mode 100644 index 0000000000..f93cf8562a --- /dev/null +++ b/types/natural-compare/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "dtslint/dt.json" +} From b2373af1a29c1ffa9b7c5b902aced1360159f0bb Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 11:56:37 +0500 Subject: [PATCH 2/7] Fix headers --- types/natural-compare-lite/index.d.ts | 2 +- types/natural-compare-lite/natural-compare-lite-tests.ts | 2 +- types/natural-compare/index.d.ts | 2 +- types/natural-compare/natural-compare-tests.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types/natural-compare-lite/index.d.ts b/types/natural-compare-lite/index.d.ts index 5e1a10bbdb..414dcf9233 100644 --- a/types/natural-compare-lite/index.d.ts +++ b/types/natural-compare-lite/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for natural-compare-lite 1.4.0 +// Type definitions for natural-compare-lite 1.4 // Project: https://github.com/litejs/natural-compare-lite // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped diff --git a/types/natural-compare-lite/natural-compare-lite-tests.ts b/types/natural-compare-lite/natural-compare-lite-tests.ts index dc483b4bcd..c073f4b46f 100644 --- a/types/natural-compare-lite/natural-compare-lite-tests.ts +++ b/types/natural-compare-lite/natural-compare-lite-tests.ts @@ -1,4 +1,4 @@ -// Type definitions for natural-compare-lite 1.4.0 +// Type definitions for natural-compare-lite 1.4 // Project: https://github.com/litejs/natural-compare-lite // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped diff --git a/types/natural-compare/index.d.ts b/types/natural-compare/index.d.ts index 57e0999157..d5bd9a6ee5 100644 --- a/types/natural-compare/index.d.ts +++ b/types/natural-compare/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for natural-compare 1.4.0 +// Type definitions for natural-compare 1.4 // Project: https://github.com/litejs/natural-compare-lite // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped diff --git a/types/natural-compare/natural-compare-tests.ts b/types/natural-compare/natural-compare-tests.ts index 59e7d53163..994788570c 100644 --- a/types/natural-compare/natural-compare-tests.ts +++ b/types/natural-compare/natural-compare-tests.ts @@ -1,4 +1,4 @@ -// Type definitions for natural-compare 1.4.0 +// Type definitions for natural-compare 1.4 // Project: https://github.com/litejs/natural-compare-lite // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped From 2e60bca3febc046b6a477d1d4081832baa346a83 Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 12:03:48 +0500 Subject: [PATCH 3/7] Remove headers other than index.d.ts --- types/natural-compare-lite/natural-compare-lite-tests.ts | 5 ----- types/natural-compare/natural-compare-tests.ts | 5 ----- 2 files changed, 10 deletions(-) diff --git a/types/natural-compare-lite/natural-compare-lite-tests.ts b/types/natural-compare-lite/natural-compare-lite-tests.ts index c073f4b46f..dd823544fb 100644 --- a/types/natural-compare-lite/natural-compare-lite-tests.ts +++ b/types/natural-compare-lite/natural-compare-lite-tests.ts @@ -1,8 +1,3 @@ -// Type definitions for natural-compare-lite 1.4 -// Project: https://github.com/litejs/natural-compare-lite -// Definitions by: Doniyor Aliyev -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - import compare = require("natural-compare-lite"); ['a', 's', 'd'].sort(compare); diff --git a/types/natural-compare/natural-compare-tests.ts b/types/natural-compare/natural-compare-tests.ts index 994788570c..91a4710c15 100644 --- a/types/natural-compare/natural-compare-tests.ts +++ b/types/natural-compare/natural-compare-tests.ts @@ -1,8 +1,3 @@ -// Type definitions for natural-compare 1.4 -// Project: https://github.com/litejs/natural-compare-lite -// Definitions by: Doniyor Aliyev -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - import compare = require("natural-compare"); ['a', 's', 'd'].sort(compare); From e44ef37846ec95510ea3de1d804e72a6efae28be Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 17:27:46 +0500 Subject: [PATCH 4/7] Small tweaks --- types/natural-compare-lite/tsconfig.json | 2 +- types/natural-compare/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/types/natural-compare-lite/tsconfig.json b/types/natural-compare-lite/tsconfig.json index e3ed3ac1e0..ddfcb244cb 100644 --- a/types/natural-compare-lite/tsconfig.json +++ b/types/natural-compare-lite/tsconfig.json @@ -6,7 +6,7 @@ ], "noImplicitAny": true, "noImplicitThis": true, - "strictNullChecks": false, + "strictNullChecks": true, "strictFunctionTypes": true, "baseUrl": "../", "typeRoots": [ diff --git a/types/natural-compare/tsconfig.json b/types/natural-compare/tsconfig.json index 81322d5590..c8af37bb22 100644 --- a/types/natural-compare/tsconfig.json +++ b/types/natural-compare/tsconfig.json @@ -6,7 +6,7 @@ ], "noImplicitAny": true, "noImplicitThis": true, - "strictNullChecks": false, + "strictNullChecks": true, "strictFunctionTypes": true, "baseUrl": "../", "typeRoots": [ From faf67489b44a73fcf8da71c04fbb6e17f97c5f72 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 15 Feb 2019 21:02:09 +0500 Subject: [PATCH 5/7] Improve return types Co-Authored-By: doniyor2109 --- types/natural-compare-lite/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/natural-compare-lite/index.d.ts b/types/natural-compare-lite/index.d.ts index 414dcf9233..9811d4baa8 100644 --- a/types/natural-compare-lite/index.d.ts +++ b/types/natural-compare-lite/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare function naturalCompare(a: string, b: string): number; +declare function naturalCompare(a: string, b: string): -1 | 0 | 1; declare global { interface StringConstructor { From 557883080b6c4aec5c8df5b1660a2796e38ae13b Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 21:05:24 +0500 Subject: [PATCH 6/7] Improve return type --- types/natural-compare/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/natural-compare/index.d.ts b/types/natural-compare/index.d.ts index d5bd9a6ee5..fb4fdecfe0 100644 --- a/types/natural-compare/index.d.ts +++ b/types/natural-compare/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: Doniyor Aliyev // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare function naturalCompare(a: string, b: string): number; +declare function naturalCompare(a: string, b: string): -1 | 0 | 1; declare global { interface StringConstructor { From 5bf8b8f9edf8474fad3e937cccb8d990ff2a9c38 Mon Sep 17 00:00:00 2001 From: doniyor2109 Date: Fri, 15 Feb 2019 21:06:08 +0500 Subject: [PATCH 7/7] Remove String.naturalCompare --- types/natural-compare-lite/index.d.ts | 6 ------ types/natural-compare-lite/natural-compare-lite-tests.ts | 2 -- types/natural-compare/index.d.ts | 6 ------ types/natural-compare/natural-compare-tests.ts | 2 -- 4 files changed, 16 deletions(-) diff --git a/types/natural-compare-lite/index.d.ts b/types/natural-compare-lite/index.d.ts index 9811d4baa8..d9dd5f3e6d 100644 --- a/types/natural-compare-lite/index.d.ts +++ b/types/natural-compare-lite/index.d.ts @@ -5,10 +5,4 @@ declare function naturalCompare(a: string, b: string): -1 | 0 | 1; -declare global { - interface StringConstructor { - naturalCompare: typeof naturalCompare; - } -} - export = naturalCompare; diff --git a/types/natural-compare-lite/natural-compare-lite-tests.ts b/types/natural-compare-lite/natural-compare-lite-tests.ts index dd823544fb..c82a695344 100644 --- a/types/natural-compare-lite/natural-compare-lite-tests.ts +++ b/types/natural-compare-lite/natural-compare-lite-tests.ts @@ -1,5 +1,3 @@ import compare = require("natural-compare-lite"); ['a', 's', 'd'].sort(compare); - -['a', 's', 'd'].sort(String.naturalCompare); diff --git a/types/natural-compare/index.d.ts b/types/natural-compare/index.d.ts index fb4fdecfe0..bb26b925f7 100644 --- a/types/natural-compare/index.d.ts +++ b/types/natural-compare/index.d.ts @@ -5,10 +5,4 @@ declare function naturalCompare(a: string, b: string): -1 | 0 | 1; -declare global { - interface StringConstructor { - naturalCompare: typeof naturalCompare; - } -} - export = naturalCompare; diff --git a/types/natural-compare/natural-compare-tests.ts b/types/natural-compare/natural-compare-tests.ts index 91a4710c15..d006905f47 100644 --- a/types/natural-compare/natural-compare-tests.ts +++ b/types/natural-compare/natural-compare-tests.ts @@ -1,5 +1,3 @@ import compare = require("natural-compare"); ['a', 's', 'd'].sort(compare); - -['a', 's', 'd'].sort(String.naturalCompare);