From ed9f3a74543b46b1b4eb52fa6940f058df7239c2 Mon Sep 17 00:00:00 2001
From: Takuma Suzuki <pferd262@gmail.com>
Date: Wed, 15 May 2019 03:22:40 +0900
Subject: [PATCH] [@types/nanoid] Add type definitions for
 nanoid/async/(random|generate|format) (#35335)

Fix typo
---
 types/nanoid/async/format.d.ts                      |  7 +++++++
 types/nanoid/async/generate.d.ts                    |  3 +++
 .../index-browser.d.ts}                             |  0
 types/nanoid/{async.d.ts => async/index.d.ts}       |  0
 types/nanoid/async/random-browser.d.ts              |  3 +++
 types/nanoid/async/random.d.ts                      |  5 +++++
 types/nanoid/index.d.ts                             |  2 +-
 types/nanoid/nanoid-tests.ts                        | 13 +++++++++++--
 types/nanoid/tsconfig.json                          |  8 ++++++--
 9 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 types/nanoid/async/format.d.ts
 create mode 100644 types/nanoid/async/generate.d.ts
 rename types/nanoid/{async-browser.d.ts => async/index-browser.d.ts} (100%)
 rename types/nanoid/{async.d.ts => async/index.d.ts} (100%)
 create mode 100644 types/nanoid/async/random-browser.d.ts
 create mode 100644 types/nanoid/async/random.d.ts

diff --git a/types/nanoid/async/format.d.ts b/types/nanoid/async/format.d.ts
new file mode 100644
index 0000000000..4177a75164
--- /dev/null
+++ b/types/nanoid/async/format.d.ts
@@ -0,0 +1,7 @@
+declare function format(
+    random: (bytes: number) => Promise<number[]>,
+    alphabet: string,
+    size: number
+): Promise<string>;
+
+export = format;
diff --git a/types/nanoid/async/generate.d.ts b/types/nanoid/async/generate.d.ts
new file mode 100644
index 0000000000..7ada858e08
--- /dev/null
+++ b/types/nanoid/async/generate.d.ts
@@ -0,0 +1,3 @@
+declare function generate(alphabet: string, size: number): Promise<string>;
+
+export = generate;
diff --git a/types/nanoid/async-browser.d.ts b/types/nanoid/async/index-browser.d.ts
similarity index 100%
rename from types/nanoid/async-browser.d.ts
rename to types/nanoid/async/index-browser.d.ts
diff --git a/types/nanoid/async.d.ts b/types/nanoid/async/index.d.ts
similarity index 100%
rename from types/nanoid/async.d.ts
rename to types/nanoid/async/index.d.ts
diff --git a/types/nanoid/async/random-browser.d.ts b/types/nanoid/async/random-browser.d.ts
new file mode 100644
index 0000000000..1e4c41989e
--- /dev/null
+++ b/types/nanoid/async/random-browser.d.ts
@@ -0,0 +1,3 @@
+declare function randomBrowser(bytes: number): Promise<Uint8Array>;
+
+export = randomBrowser;
diff --git a/types/nanoid/async/random.d.ts b/types/nanoid/async/random.d.ts
new file mode 100644
index 0000000000..e2991a7334
--- /dev/null
+++ b/types/nanoid/async/random.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="node" />
+
+declare function random(bytes: number): Promise<Buffer>;
+
+export = random;
diff --git a/types/nanoid/index.d.ts b/types/nanoid/index.d.ts
index ec18370859..faaf54029a 100644
--- a/types/nanoid/index.d.ts
+++ b/types/nanoid/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for nanoid 1.2
+// Type definitions for nanoid 2.0
 // Project: https://github.com/ai/nanoid
 // Definitions by: Ruben Schmidmeister <https://github.com/bash>
 //                 Daniel Zhang <https://github.com/fadezhanger>
diff --git a/types/nanoid/nanoid-tests.ts b/types/nanoid/nanoid-tests.ts
index 8783d1b61f..610e5570f5 100644
--- a/types/nanoid/nanoid-tests.ts
+++ b/types/nanoid/nanoid-tests.ts
@@ -1,16 +1,25 @@
+import asyncFormat = require('nanoid/async/format');
+import asyncGenerate = require('nanoid/async/generate');
+import asyncRandom = require('nanoid/async/random');
+import asyncRandomBrowser = require('nanoid/async/random-browser');
 import nanoid = require('nanoid');
 import format = require('nanoid/format');
 import generate = require('nanoid/generate');
 import random = require('nanoid/random');
 import randomBrowser = require('nanoid/random-browser');
 import url = require('nanoid/url');
-import nanoidAsync = require('nanoid/async');
-import nanoidAsyncBrowser = require('nanoid/async-browser');
+import nanoidAsync = require('nanoid/async/index');
+import nanoidAsyncBrowser = require('nanoid/async/index-browser');
 import nanoidNonSecure = require('nanoid/non-secure');
 import generateNonSecure = require('nanoid/non-secure/generate');
 
 const _random = (size: number) => [1, 2, 3, 4];
+const _asyncRandom = (size: number) => Promise.resolve([1, 2, 3, 4]);
 
+asyncFormat(_asyncRandom, "abcdef", 5).then((id) => console.log(id));
+asyncGenerate('0123456789абвгдеё', 5).then((id) => console.log(id));
+asyncRandom(10).then((id) => console.log(id));
+asyncRandomBrowser(10).then((id) => console.log(id));
 nanoid();
 nanoid(10);
 format(_random, "abcdef", 5);
diff --git a/types/nanoid/tsconfig.json b/types/nanoid/tsconfig.json
index 1c64d18467..fd0285a21d 100644
--- a/types/nanoid/tsconfig.json
+++ b/types/nanoid/tsconfig.json
@@ -19,8 +19,12 @@
     "files": [
         "non-secure/index.d.ts",
         "non-secure/generate.d.ts",
-        "async-browser.d.ts",
-        "async.d.ts",
+        "async/format.d.ts",
+        "async/generate.d.ts",
+        "async/index-browser.d.ts",
+        "async/index.d.ts",
+        "async/random-browser.d.ts",
+        "async/random.d.ts",
         "format.d.ts",
         "generate.d.ts",
         "index.d.ts",