Merge pull request #31 from kvendrik/feature/improve-getaborttoken

improves getAbortToken

src/FetchREST.ts

@@ -1,4 +1,8 @@
-import queryObjectToString, {QueryObject} from './queryObjectToString';
+import {
+  queryObjectToString,
+  QueryObject,
+  createUniqueIDFactory,
+} from './utilities';
 
 export type Payload = RequestInit['body'] | object;
 
@@ -26,6 +30,8 @@ export type GlobalRequestOptionsGetter = () => GlobalRequestOptions;
 
 export type Middleware = (response: Promise<Response>) => Promise<Response>;
 
+const getUniqueAbortToken = createUniqueIDFactory('abort-token');
+
 export default class FetchREST {
   private globalOptions: GlobalRequestOptions | GlobalRequestOptionsGetter;
   private requestMiddleware: Middleware;
@@ -88,14 +94,9 @@ export default class FetchREST {
     }
   }
 
+  // eslint-disable-next-line class-methods-use-this
   getAbortToken() {
-    let token = '';
-    while (token === '' || this.abortControllers[token]) {
-      token = Math.random()
-        .toString(36)
-        .substring(2, 15);
-    }
-    return token;
+    return getUniqueAbortToken();
   }
 
   private request(

src/index.ts

@@ -10,4 +10,4 @@ export {
   GlobalRequestOptionsGetter,
   Middleware,
 } from './FetchREST';
-export {QueryObject} from './queryObjectToString';
+export {QueryObject} from './utilities';

src/tests/FetchREST.test.ts

@@ -760,8 +760,14 @@ describe('getAbortToken', () => {
     const fetchRest = new FetchREST({
       apiUrl: 'https://api.github.com',
     });
-    const token = fetchRest.getAbortToken();
-    expect(typeof token).toBe('string');
+
+    const tokens = [];
+
+    for (let i = 0; i < 10; i += 1) {
+      const newToken = fetchRest.getAbortToken();
+      expect(tokens).not.toContain(newToken);
+      tokens.push(newToken);
+    }
   });
 });
 

src/utilities/createUniqueIDFactory/createUniqueIDFactory.ts

@@ -0,0 +1,7 @@
+export default function createUniqueIDFactory(prefix: string) {
+  let index = 0;
+  return () => {
+    index += 1;
+    return `${prefix}${index}`;
+  };
+}

src/utilities/createUniqueIDFactory/index.ts

@@ -0,0 +1 @@
+export {default} from './createUniqueIDFactory';

src/utilities/createUniqueIDFactory/tests/createUniqueIDFactory.test.ts

@@ -0,0 +1,21 @@
+import createUniqueIDFactory from '../createUniqueIDFactory';
+
+describe('createUniqueIDFactory', () => {
+  it('returns a new function that returns a string', () => {
+    const factory = createUniqueIDFactory('unique-token');
+    expect(typeof factory()).toBe('string');
+  });
+
+  it('prefixes the number with the given prefix', () => {
+    const factory = createUniqueIDFactory('unique-token');
+    expect(factory()).toBe('unique-token1');
+  });
+
+  it('increases the appended number every time its called', () => {
+    const factory = createUniqueIDFactory('unique-token');
+    expect(factory()).toBe('unique-token1');
+    expect(factory()).toBe('unique-token2');
+    expect(factory()).toBe('unique-token3');
+    expect(factory()).toBe('unique-token4');
+  });
+});

src/utilities/index.ts

@@ -0,0 +1,5 @@
+export {
+  default as queryObjectToString,
+  QueryObject,
+} from './queryObjectToString';
+export {default as createUniqueIDFactory} from './createUniqueIDFactory';

src/utilities/queryObjectToString/index.ts

@@ -0,0 +1 @@
+export {default, QueryObject} from './queryObjectToString';