Fixed length issue in bytes and string methods (#3) (#4)

.gitignore

@@ -4,4 +4,5 @@ coverage/
 .vscode/
 package-lock.json
 yarn.lock
-*.log
+*.log
+test/__*__.js

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.  
 
+## [v1.0.2](https://github.com/pauldenver/generate-api-key/compare/v1.0.1...v1.0.2)
+
+### Bug Fixes
+
+*  Updated how the key length is determined when using the `bytes` method ([#3](https://github.com/pauldenver/generate-api-key/issues/3)).
+*  Fixed a typo in the `chance.natural` usage in the `string` method.
+
 ## [v1.0.1](https://github.com/pauldenver/generate-api-key/compare/v1.0.0...v1.0.1)
 
 ### Features

package.json

@@ -1,7 +1,7 @@
 {
   "name": "generate-api-key",
   "description": "A library for generating random API key/access tokens",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "keywords": [

src/generate_api_key.ts

@@ -38,7 +38,6 @@ import {
  * @returns The API key.
  */
 const getCryptoApiKey = (options: BytesGenerationOptions): string => {
-  let totalBytes: number;
   let apiKey: string;
 
   // Get the options.
@@ -50,24 +49,21 @@ const getCryptoApiKey = (options: BytesGenerationOptions): string => {
   // Get a 'Chance' instance.
   const chance = new Chance();
 
-  if (options.length) {
-    totalBytes = Math.ceil(options.length / 2);
-  } else {
-    // Get a random number.
-    const numVal = chance.natural({ min: options.min, max: options.max });
-    // Set the total bytes.
-    totalBytes = Math.ceil(numVal / 2);
-  }
+  // Determine the length for the key.
+  const length = options.length ?? chance.natural({
+    min: options.min,
+    max: options.max
+  });
+
+  // Set the total bytes.
+  const totalBytes = Math.ceil(length / 2);
 
   // Generate the API key.
   apiKey = randomBytes(totalBytes).toString('hex');
 
   // Check the key length.
-  if (options.length && (apiKey.length > options.length)) {
-    const endIndex = apiKey.length - (apiKey.length - options.length);
-    apiKey = apiKey.slice(0, endIndex);
-  } else if (apiKey.length > options.max) {
-    const endIndex = apiKey.length - (apiKey.length - options.max);
+  if (apiKey.length > length) {
+    const endIndex = apiKey.length - (apiKey.length - length);
     apiKey = apiKey.slice(0, endIndex);
   }
 
@@ -94,7 +90,7 @@ const getRandomStringApiKey = (options: StringGenerationOptions): string => {
   // Determine the length for the key.
   const length = options.length ?? chance.natural({
     min: options.min,
-    max: options.min
+    max: options.max
   });
 
   // Generate the string.