fix(tests): make tests pass

Author: wodCZ

package.json

@@ -35,7 +35,7 @@
     "prebuild": "npm run clean",
     "precommit": "lint-staged",
     "test": "jest",
-    "test:watch": "jest --watchAll --onlyChanged",
+    "test:watch": "jest --watchAll",
     "coverage": "jest --coverage",
     "watch": "tsc -w -p .",
     "publish:git": "git push && git push --tags",
@@ -56,22 +56,23 @@
   },
   "jest": {
     "moduleFileExtensions": [
-      "ts",
       "js",
-      "json"
+      "json",
+      "ts"
     ],
     "transform": {
-      "\\.ts$": "ts-jest"
+      "\\.ts$": [
+        "ts-jest",
+        {
+          "babelConfig": true
+        }
+      ]
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|js)$",
-    "globals": {
-      "ts-jest": {
-        "useBabelrc": true
-      }
-    },
     "transformIgnorePatterns": [
       "node_modules/(?!apollo-cache-hermes)"
-    ]
+    ],
+    "preset": "ts-jest"
   },
   "dependencies": {},
   "peerDependencies": {

src/Cache.ts

@@ -5,7 +5,7 @@ export default class Cache<T> {
   cache: ApolloCache<T>;
   serialize: boolean;
 
-  constructor(options: ApolloPersistOptions<T>) {
+  constructor(options: Pick<ApolloPersistOptions<T>, 'cache' | 'serialize'>) {
     const { cache, serialize = true } = options;
 
     this.cache = cache;

src/CachePersistor.ts

@@ -17,14 +17,14 @@ export default class CachePersistor<T> {
     if (!options.cache) {
       throw new Error(
         'In order to persist your Apollo Cache, you need to pass in a cache. ' +
-          'Please see https://www.apollographql.com/docs/react/basics/caching.html for our default InMemoryCache.'
+          'Please see https://www.apollographql.com/docs/react/basics/caching.html for our default InMemoryCache.',
       );
     }
 
     if (!options.storage) {
       throw new Error(
         'In order to persist your Apollo Cache, you need to pass in an underlying storage provider. ' +
-          'Please see https://github.com/apollographql/apollo-cache-persist#storage-providers'
+          'Please see https://github.com/apollographql/apollo-cache-persist#storage-providers',
       );
     }
 
@@ -36,9 +36,10 @@ export default class CachePersistor<T> {
 
     this.log = log;
     this.cache = cache;
-    this.storage = storage;
-    this.persistor = persistor;
-    this.trigger = trigger;
+    // TODO: remove type assertion
+    this.storage = storage as Storage<T>;
+    this.persistor = persistor as Persistor<T>;
+    this.trigger = trigger as Trigger<T>;
   }
 
   /**

src/Log.ts

@@ -7,7 +7,7 @@ export default class Log<T> {
   static buffer = 30;
   static prefix = '[apollo-cache-persist]';
 
-  constructor(options: ApolloPersistOptions<T>) {
+  constructor(options: Pick<ApolloPersistOptions<T>, 'debug'>) {
     const { debug = false } = options;
 
     this.debug = debug;

src/Persistor.ts

@@ -20,12 +20,9 @@ export default class Persistor<T> {
 
   constructor(
     { log, cache, storage }: PersistorConfig<T>,
-    options: ApolloPersistOptions<T>,
+    options: Pick<ApolloPersistOptions<T>, 'maxSize' | 'persistenceMapper'>,
   ) {
-    const {
-      maxSize = 1024 * 1024,
-      persistenceMapper,
-    } = options;
+    const { maxSize = 1024 * 1024, persistenceMapper } = options;
 
     this.log = log;
     this.cache = cache;

src/Storage.ts

@@ -8,7 +8,7 @@ export default class Storage<T> {
   storage: PersistentStorage<PersistedData<T>>;
   key: string;
 
-  constructor(options: ApolloPersistOptions<T>) {
+  constructor(options: Pick<ApolloPersistOptions<T>, 'storage' | 'key'>) {
     const { storage, key = 'apollo-cache-persist' } = options;
 
     this.storage = storage;

src/Trigger.ts

@@ -21,7 +21,7 @@ export default class Trigger<T> {
 
   constructor(
     { log, persistor }: TriggerConfig<T>,
-    options: ApolloPersistOptions<T>
+    options: Pick<ApolloPersistOptions<T>, 'cache' | 'debounce' | 'trigger'>,
   ) {
     const { defaultDebounce } = Trigger;
     const { cache, debounce, trigger = 'write' } = options;

src/__mocks__/MockCache.ts

@@ -1,12 +1,14 @@
 import Cache from '../Cache';
 import { ApolloPersistOptions, PersistedData } from '../types';
 
-export default class MockCache<T> implements Cache<T> {
+export default class MockCache<T, U extends boolean = true>
+  implements Cache<T>
+{
   cache: null;
   serialize: boolean;
   data: PersistedData<T>;
 
-  constructor(options: ApolloPersistOptions<T>) {
+  constructor(options: Pick<ApolloPersistOptions<T, U>, 'serialize'>) {
     const { serialize = true } = options;
     this.serialize = serialize;
   }

src/__mocks__/MockStorage.ts

@@ -1,20 +1,20 @@
 import { PersistentStorage } from '../types';
 
-export default class MockStorage implements PersistentStorage {
+export default class MockStorage implements PersistentStorage<any> {
   storage: Map<string, string>;
 
   constructor() {
     this.storage = new Map();
   }
 
-  setItem(key: string, data: string): Promise<any> {
+  setItem(key: string, data: string): Promise<void> {
     return new Promise(resolve => {
       this.storage.set(key, data);
       resolve();
     });
   }
 
-  removeItem(key: string): Promise<any> {
+  removeItem(key: string): Promise<void> {
     return new Promise((resolve, reject) => {
       this.storage.delete(key);
       resolve();

src/__mocks__/MockStorageSync.ts

@@ -1,6 +1,6 @@
 import { PersistentStorage } from '../types';
 
-export default class MockStorageSync implements PersistentStorage {
+export default class MockStorageSync implements PersistentStorage<any> {
   storage: Map<string, string>;
 
   constructor() {