Merge branch 'inlocalstorage_storageAdapter' into inlocalstorage_sessionStorage

Author: EmilianoSanchez

src/storages/inLocalStorage/__tests__/wrapper.mock.ts

@@ -1,4 +1,4 @@
-import { storageAdapter } from '..';
+import { storageAdapter } from '../storageAdapter';
 import SplitIO from '../../../../types/splitio';
 import { loggerMock } from '../../../logger/__tests__/sdkLogger.mock';
 

src/storages/inLocalStorage/index.ts

@@ -17,52 +17,7 @@ import { getMatching } from '../../utils/key';
 import { validateCache } from './validateCache';
 import { ILogger } from '../../logger/types';
 import SplitIO from '../../../types/splitio';
-
-function isTillKey(key: string) {
-  return key.endsWith('.till');
-}
-
-export function storageAdapter(log: ILogger, prefix: string, wrapper: SplitIO.StorageWrapper): StorageAdapter {
-  let cache: Record<string, string> = {};
-
-  let connectPromise: Promise<void> | undefined;
-  let disconnectPromise = Promise.resolve();
-
-  return {
-    load() {
-      return connectPromise || (connectPromise = Promise.resolve(wrapper.getItem(prefix)).then((storedCache) => {
-        cache = JSON.parse(storedCache || '{}');
-      }).catch((e) => {
-        log.error(LOG_PREFIX + 'Rejected promise calling storage getItem, with error: ' + e);
-      }));
-    },
-    save() {
-      return disconnectPromise = disconnectPromise.then(() => {
-        return Promise.resolve(wrapper.setItem(prefix, JSON.stringify(cache))).catch((e) => {
-          log.error(LOG_PREFIX + 'Rejected promise calling storage setItem, with error: ' + e);
-        });
-      });
-    },
-
-    get length() {
-      return Object.keys(cache).length;
-    },
-    getItem(key: string) {
-      return cache[key] || null;
-    },
-    key(index: number) {
-      return Object.keys(cache)[index] || null;
-    },
-    removeItem(key: string) {
-      delete cache[key];
-      if (isTillKey(key)) this.save!();
-    },
-    setItem(key: string, value: string) {
-      cache[key] = value;
-      if (isTillKey(key)) this.save!();
-    }
-  };
-}
+import { storageAdapter } from './storageAdapter';
 
 function validateStorage(log: ILogger, prefix: string, wrapper?: SplitIO.StorageWrapper): StorageAdapter | undefined {
   if (wrapper) {

src/storages/inLocalStorage/storageAdapter.ts

@@ -0,0 +1,50 @@
+import { ILogger } from '../../logger/types';
+import SplitIO from '../../../types/splitio';
+import { LOG_PREFIX } from './constants';
+import { StorageAdapter } from '../types';
+
+function isTillKey(key: string) {
+  return key.endsWith('.till');
+}
+
+export function storageAdapter(log: ILogger, prefix: string, wrapper: SplitIO.StorageWrapper): StorageAdapter {
+  let cache: Record<string, string> = {};
+
+  let connectPromise: Promise<void> | undefined;
+  let disconnectPromise = Promise.resolve();
+
+  return {
+    load() {
+      return connectPromise || (connectPromise = Promise.resolve(wrapper.getItem(prefix)).then((storedCache) => {
+        cache = JSON.parse(storedCache || '{}');
+      }).catch((e) => {
+        log.error(LOG_PREFIX + 'Rejected promise calling storage getItem, with error: ' + e);
+      }));
+    },
+    save() {
+      return disconnectPromise = disconnectPromise.then(() => {
+        return Promise.resolve(wrapper.setItem(prefix, JSON.stringify(cache))).catch((e) => {
+          log.error(LOG_PREFIX + 'Rejected promise calling storage setItem, with error: ' + e);
+        });
+      });
+    },
+
+    get length() {
+      return Object.keys(cache).length;
+    },
+    getItem(key: string) {
+      return cache[key] || null;
+    },
+    key(index: number) {
+      return Object.keys(cache)[index] || null;
+    },
+    removeItem(key: string) {
+      delete cache[key];
+      if (isTillKey(key)) this.save!();
+    },
+    setItem(key: string, value: string) {
+      cache[key] = value;
+      if (isTillKey(key)) this.save!();
+    }
+  };
+}