From ca7e81b1f39cca6cb508613455af0eece498dc08 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Sun, 3 Mar 2019 17:16:26 +1100
Subject: [PATCH 1/2] Added type defs for pretty-time

---
 types/pretty-time/index.d.ts           | 40 ++++++++++++++++++++++++++
 types/pretty-time/pretty-time-tests.ts | 13 +++++++++
 types/pretty-time/tsconfig.json        | 25 ++++++++++++++++
 types/pretty-time/tslint.json          |  3 ++
 4 files changed, 81 insertions(+)
 create mode 100644 types/pretty-time/index.d.ts
 create mode 100644 types/pretty-time/pretty-time-tests.ts
 create mode 100644 types/pretty-time/tsconfig.json
 create mode 100644 types/pretty-time/tslint.json

diff --git a/types/pretty-time/index.d.ts b/types/pretty-time/index.d.ts
new file mode 100644
index 0000000000..c46273abaa
--- /dev/null
+++ b/types/pretty-time/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for pretty-time 1.1
+// Project: https://github.com/jonschlinkert/pretty-time
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+export type Increment =
+    | 'ns'
+    | 'nano'
+    | 'nanosecond'
+    | 'nanoseconds'
+    | 'μs'
+    | 'micro'
+    | 'microsecond'
+    | 'microseconds'
+    | 'ms'
+    | 'milli'
+    | 'millisecond'
+    | 'milliseconds'
+    | 's'
+    | 'sec'
+    | 'second'
+    | 'seconds'
+    | 'm'
+    | 'min'
+    | 'minute'
+    | 'minutes'
+    | 'h'
+    | 'hr'
+    | 'hour'
+    | 'hours'
+    | 'd'
+    | 'day'
+    | 'days'
+    | 'w'
+    | 'wk'
+    | 'week'
+    | 'weeks';
+
+export default function(time: number[], smallest?: Increment, digits?: number): string;
diff --git a/types/pretty-time/pretty-time-tests.ts b/types/pretty-time/pretty-time-tests.ts
new file mode 100644
index 0000000000..c6f2e926ae
--- /dev/null
+++ b/types/pretty-time/pretty-time-tests.ts
@@ -0,0 +1,13 @@
+import DateTime from "pretty-time";
+
+DateTime([1200708, 795428088]);
+
+DateTime([0, 795428088]);
+
+DateTime([0, 795428088], 'h');
+
+DateTime([0, 795428088], 'm');
+
+DateTime([0, 795428088], 'μs', 2);
+
+DateTime([0, 795428088], 'ms', 1);
diff --git a/types/pretty-time/tsconfig.json b/types/pretty-time/tsconfig.json
new file mode 100644
index 0000000000..d18e4b1fa1
--- /dev/null
+++ b/types/pretty-time/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "pretty-time-tests.ts"
+    ]
+}
diff --git a/types/pretty-time/tslint.json b/types/pretty-time/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/pretty-time/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 44231510355e31da2b44fb51fccd5231e553e2d4 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Mon, 4 Mar 2019 19:29:13 +1100
Subject: [PATCH 2/2] Updated export type

---
 types/pretty-time/index.d.ts           | 6 ++++--
 types/pretty-time/pretty-time-tests.ts | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/pretty-time/index.d.ts b/types/pretty-time/index.d.ts
index c46273abaa..0dadc88091 100644
--- a/types/pretty-time/index.d.ts
+++ b/types/pretty-time/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
-export type Increment =
+type Increment =
     | 'ns'
     | 'nano'
     | 'nanosecond'
@@ -37,4 +37,6 @@ export type Increment =
     | 'week'
     | 'weeks';
 
-export default function(time: number[], smallest?: Increment, digits?: number): string;
+declare function prettyTime(time: number[], smallest?: Increment, digits?: number): string;
+
+export = prettyTime;
diff --git a/types/pretty-time/pretty-time-tests.ts b/types/pretty-time/pretty-time-tests.ts
index c6f2e926ae..895042ecd1 100644
--- a/types/pretty-time/pretty-time-tests.ts
+++ b/types/pretty-time/pretty-time-tests.ts
@@ -1,4 +1,4 @@
-import DateTime from "pretty-time";
+import DateTime = require("pretty-time");
 
 DateTime([1200708, 795428088]);