From c9b217ba146aeaacb33ce9340a6d36446bb0a064 Mon Sep 17 00:00:00 2001 From: Ilia Beliaev Date: Fri, 7 Dec 2018 14:52:26 +0300 Subject: [PATCH 1/3] Added missing options. --- types/pretty-ms/index.d.ts | 6 +++++- types/pretty-ms/pretty-ms-tests.ts | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/types/pretty-ms/index.d.ts b/types/pretty-ms/index.d.ts index b1e151cd65..ca9bf663e2 100644 --- a/types/pretty-ms/index.d.ts +++ b/types/pretty-ms/index.d.ts @@ -1,7 +1,8 @@ -// Type definitions for pretty-ms 3.2 +// Type definitions for pretty-ms 4.0 // Project: https://github.com/sindresorhus/pretty-ms#readme // Definitions by: BendingBender // ocboogie +// silh // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped export = prettyMs; @@ -14,6 +15,9 @@ declare namespace prettyMs { msDecimalDigits?: number; keepDecimalsOnWholeSeconds?: boolean; compact?: boolean; + unitCount?: number; verbose?: boolean; + separateMs?: boolean; + formatSubMs?: boolean; } } diff --git a/types/pretty-ms/pretty-ms-tests.ts b/types/pretty-ms/pretty-ms-tests.ts index ae5e8120b2..bb5e8a69ec 100644 --- a/types/pretty-ms/pretty-ms-tests.ts +++ b/types/pretty-ms/pretty-ms-tests.ts @@ -7,4 +7,7 @@ str = prettyMs(1335669000, {verbose: true}); str = prettyMs(1335669000, {keepDecimalsOnWholeSeconds: true}); str = prettyMs(1335669000, {secDecimalDigits: 1}); str = prettyMs(1335669000, {msDecimalDigits: 2}); +str = prettyMs(1335669000, {unitCount: 2}); +str = prettyMs(1335669000, {separateMs: true}); +str = prettyMs(1335669000, {formatSubMs: true}); str = prettyMs(new Date(2014, 0, 1, 10, 40).getTime() - new Date(2014, 0, 1, 10, 5).getTime()); From ef8804d22c64195fecee77e1c4bf194be75c0516 Mon Sep 17 00:00:00 2001 From: Ilia Beliaev Date: Sun, 9 Dec 2018 21:47:10 +0300 Subject: [PATCH 2/3] Added old version. --- types/pretty-ms/v3.2/index.d.ts | 19 +++++++++++++++ types/pretty-ms/v3.2/pretty-ms-tests.ts | 10 ++++++++ types/pretty-ms/v3.2/tsconfig.json | 31 +++++++++++++++++++++++++ types/pretty-ms/v3.2/tslint.json | 1 + 4 files changed, 61 insertions(+) create mode 100644 types/pretty-ms/v3.2/index.d.ts create mode 100644 types/pretty-ms/v3.2/pretty-ms-tests.ts create mode 100644 types/pretty-ms/v3.2/tsconfig.json create mode 100644 types/pretty-ms/v3.2/tslint.json diff --git a/types/pretty-ms/v3.2/index.d.ts b/types/pretty-ms/v3.2/index.d.ts new file mode 100644 index 0000000000..b1e151cd65 --- /dev/null +++ b/types/pretty-ms/v3.2/index.d.ts @@ -0,0 +1,19 @@ +// Type definitions for pretty-ms 3.2 +// Project: https://github.com/sindresorhus/pretty-ms#readme +// Definitions by: BendingBender +// ocboogie +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +export = prettyMs; + +declare function prettyMs(input: number, options?: prettyMs.PrettyMsOptions): string; + +declare namespace prettyMs { + interface PrettyMsOptions { + secDecimalDigits?: number; + msDecimalDigits?: number; + keepDecimalsOnWholeSeconds?: boolean; + compact?: boolean; + verbose?: boolean; + } +} diff --git a/types/pretty-ms/v3.2/pretty-ms-tests.ts b/types/pretty-ms/v3.2/pretty-ms-tests.ts new file mode 100644 index 0000000000..ae5e8120b2 --- /dev/null +++ b/types/pretty-ms/v3.2/pretty-ms-tests.ts @@ -0,0 +1,10 @@ +import prettyMs = require('pretty-ms'); + +let str: string; +str = prettyMs(133); +str = prettyMs(1337, {compact: true}); +str = prettyMs(1335669000, {verbose: true}); +str = prettyMs(1335669000, {keepDecimalsOnWholeSeconds: true}); +str = prettyMs(1335669000, {secDecimalDigits: 1}); +str = prettyMs(1335669000, {msDecimalDigits: 2}); +str = prettyMs(new Date(2014, 0, 1, 10, 40).getTime() - new Date(2014, 0, 1, 10, 5).getTime()); diff --git a/types/pretty-ms/v3.2/tsconfig.json b/types/pretty-ms/v3.2/tsconfig.json new file mode 100644 index 0000000000..34da0f6d27 --- /dev/null +++ b/types/pretty-ms/v3.2/tsconfig.json @@ -0,0 +1,31 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "baseUrl": "../../", + "typeRoots": [ + "../../" + ], + "paths": { + "pretty-ms": [ + "pretty-ms/v3.2" + ], + "pretty-ms/*": [ + "pretty-ms/v3.2/*" + ] + }, + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "pretty-ms-tests.ts" + ] +} diff --git a/types/pretty-ms/v3.2/tslint.json b/types/pretty-ms/v3.2/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/pretty-ms/v3.2/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From b004a7fdd3bc327b8ed3b10ea736937c1abb9f3a Mon Sep 17 00:00:00 2001 From: Ilia Beliaev Date: Sun, 9 Dec 2018 22:34:18 +0300 Subject: [PATCH 3/3] Fixed folder naming. --- types/pretty-ms/{v3.2 => v3}/index.d.ts | 0 types/pretty-ms/{v3.2 => v3}/pretty-ms-tests.ts | 0 types/pretty-ms/{v3.2 => v3}/tsconfig.json | 5 +---- types/pretty-ms/{v3.2 => v3}/tslint.json | 0 4 files changed, 1 insertion(+), 4 deletions(-) rename types/pretty-ms/{v3.2 => v3}/index.d.ts (100%) rename types/pretty-ms/{v3.2 => v3}/pretty-ms-tests.ts (100%) rename types/pretty-ms/{v3.2 => v3}/tsconfig.json (83%) rename types/pretty-ms/{v3.2 => v3}/tslint.json (100%) diff --git a/types/pretty-ms/v3.2/index.d.ts b/types/pretty-ms/v3/index.d.ts similarity index 100% rename from types/pretty-ms/v3.2/index.d.ts rename to types/pretty-ms/v3/index.d.ts diff --git a/types/pretty-ms/v3.2/pretty-ms-tests.ts b/types/pretty-ms/v3/pretty-ms-tests.ts similarity index 100% rename from types/pretty-ms/v3.2/pretty-ms-tests.ts rename to types/pretty-ms/v3/pretty-ms-tests.ts diff --git a/types/pretty-ms/v3.2/tsconfig.json b/types/pretty-ms/v3/tsconfig.json similarity index 83% rename from types/pretty-ms/v3.2/tsconfig.json rename to types/pretty-ms/v3/tsconfig.json index 34da0f6d27..5d4f2d4c31 100644 --- a/types/pretty-ms/v3.2/tsconfig.json +++ b/types/pretty-ms/v3/tsconfig.json @@ -14,10 +14,7 @@ ], "paths": { "pretty-ms": [ - "pretty-ms/v3.2" - ], - "pretty-ms/*": [ - "pretty-ms/v3.2/*" + "pretty-ms/v3" ] }, "types": [], diff --git a/types/pretty-ms/v3.2/tslint.json b/types/pretty-ms/v3/tslint.json similarity index 100% rename from types/pretty-ms/v3.2/tslint.json rename to types/pretty-ms/v3/tslint.json