feat: matches the latest api

.github/workflows/test.yml

@@ -6,6 +6,6 @@ jobs:
     container:
       image: google/dart:latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - run: pub get
       - run: pub run test

README.md

@@ -26,18 +26,18 @@ void main() {
 ### Custom Alphabet or length
 
 ```dart
-import 'package:nanoid/generate.dart';
+import 'package:nanoid/nanoid.dart';
 
 void main() {
-  var id = generate('1234567890abcdef', 10);
+  var id = customAlphabet('1234567890abcdef', 10);
   // ...
 }
 ```
 
 ### Async API
 
 ```dart
-import 'package:nanoid/async/nanoid.dart';
+import 'package:nanoid/async.dart';
 
 void main() async {
   var id = await nanoid();
@@ -46,19 +46,10 @@ void main() async {
 }
 ```
 
-```dart
-import 'package:nanoid/async/generate.dart';
-
-void main() async {
-  var id = await generate('1234567890abcdef', 10);
-  // ...
-}
-```
-
 ### Non-secure API
 
 ```dart
-import 'package:nanoid/non_secure/nanoid.dart';
+import 'package:nanoid/non_secure.dart';
 
 void main() {
   var non_secure_id = nanoid();
@@ -67,15 +58,6 @@ void main() {
 }
 ```
 
-```dart
-import 'package:nanoid/non_secure/generate.dart';
-
-void main() {
-  var non_secure_id = generate('1234567890abcdef', 10);
-  // ...
-}
-```
-
 ## License
 
 MIT

example/nanoid_async_example.dart

@@ -1,4 +1,4 @@
-import 'package:nanoid/async/nanoid.dart';
+import 'package:nanoid/async.dart';
 
 void main() async {
   var id = await nanoid();

example/nanoid_non_secure_example.dart

@@ -1,4 +1,4 @@
-import 'package:nanoid/non_secure/nanoid.dart';
+import 'package:nanoid/non_secure.dart';
 
 void main() {
   var non_secure_id = nanoid();

lib/async.dart

@@ -0,0 +1,18 @@
+import 'dart:math';
+import 'package:nanoid/src/url_alphabet.dart';
+export 'package:nanoid/src/url_alphabet.dart';
+
+final _random = Random.secure();
+
+Future<String> nanoid([int size = 21]) async {
+  return customAlphabet(urlAlphabet, size);
+}
+
+Future<String> customAlphabet(String alphabet, int size) async {
+  final len = alphabet.length;
+  String id = '';
+  while (0 < size--) {
+    id += alphabet[_random.nextInt(len)];
+  }
+  return id;
+}

lib/nanoid.dart

@@ -1,6 +1,18 @@
-import 'generate.dart';
-import 'url.dart';
+import 'dart:math';
+import 'package:nanoid/src/url_alphabet.dart';
+export 'package:nanoid/src/url_alphabet.dart';
+
+final _random = Random.secure();
 
 String nanoid([int size = 21]) {
-  return generate(url, size);
+  return customAlphabet(urlAlphabet, size);
+}
+
+String customAlphabet(String alphabet, int size) {
+  final len = alphabet.length;
+  String id = '';
+  while (0 < size--) {
+    id += alphabet[_random.nextInt(len)];
+  }
+  return id;
 }

lib/non_secure.dart

@@ -0,0 +1,18 @@
+import 'dart:math';
+import 'package:nanoid/src/url_alphabet.dart';
+export 'package:nanoid/src/url_alphabet.dart';
+
+final _random = Random();
+
+String nanoid([int size = 21]) {
+  return customAlphabet(urlAlphabet, size);
+}
+
+String customAlphabet(String alphabet, int size) {
+  final len = alphabet.length;
+  String id = '';
+  while (0 < size--) {
+    id += alphabet[_random.nextInt(len)];
+  }
+  return id;
+}

lib/src/url_alphabet.dart

@@ -0,0 +1,2 @@
+const urlAlphabet =
+    'ModuleSymbhasOwnPr-0123456789ABCDEFGHNRVfgctiUvz_KqYTJkLxpZXIjQW';

pubspec.yaml

@@ -1,11 +1,10 @@
 name: nanoid
 version: 0.2.0
-author: Rongjian Zhang <pd4d10@gmail.com>
 description: A tiny, secure, URL-friendly, unique string ID generator. Dart implementation of ai/nanoid
 homepage: https://github.com/pd4d10/nanoid-dart
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dev_dependencies:
   test: ^1.16.4

test/generate_test.dart → test/custom_alphabet_test.dart

@@ -1,9 +1,9 @@
 import 'package:test/test.dart';
-import 'package:nanoid/generate.dart';
+import 'package:nanoid/nanoid.dart';
 
 void main() {
   test('has options', () {
-    expect(generate('a', 5), equals('aaaaa'));
+    expect(customAlphabet('a', 5), equals('aaaaa'));
   });
 
   test('has flat distribution', () {
@@ -13,7 +13,7 @@ void main() {
 
     var chars = {};
     for (var i = 0; i < count; i++) {
-      var id = generate(alphabet, length);
+      var id = customAlphabet(alphabet, length);
       for (var j = 0; j < id.length; j++) {
         var char = id[j];
         if (chars[char] == null) chars[char] = 0;

test/nanoid_test.dart

@@ -1,14 +1,13 @@
 import 'package:test/test.dart';
 import 'package:nanoid/nanoid.dart';
-import 'package:nanoid/url.dart';
 
 void main() {
   test('generates URL-friendly IDs', () {
     for (var i = 0; i < 10; i++) {
       var id = nanoid();
       expect(id.length, equals(21));
       for (var j = 0; j < id.length; j++) {
-        expect(url.contains(id[j]), equals(true));
+        expect(urlAlphabet.contains(id[j]), equals(true));
       }
     }
   });