(refactor): whitelist and blacklist can be transforms

- so these can work as examples and so that their order is very
  explicit as they're treated like any other transform internally

- recursive import of ITransform is a bit weird, but I figure it's
  better to have that visible in index.ts as opposed to in utils.ts
  or something
  - *shrug*, not horrible the other way I guess, just have to re-export

Author: agilgur5

src/blacklistTransform.ts

@@ -0,0 +1,15 @@
+import { arrToDict } from './utils'
+import { ITransform } from './index'
+
+export function blacklistKeys (blacklist?: Array<string>): ITransform {
+  const blacklistDict = arrToDict(blacklist)
+
+  return {toStorage: function whitelistTransform (snapshot) {
+    Object.keys(snapshot).forEach((key) => {
+      if (blacklist && blacklistDict[key]) {
+        delete snapshot[key]
+      }
+    })
+    return snapshot
+  }}
+}

src/index.ts

@@ -1,6 +1,9 @@
 import { onSnapshot, applySnapshot, IStateTreeNode } from 'mobx-state-tree'
 
 import AsyncLocalStorage from './asyncLocalStorage'
+import { blacklistKeys } from './blacklistTransform'
+import { whitelistKeys } from './whitelistTransform'
+import { StrToAnyMap } from './utils'
 
 export interface IArgs {
   (name: string, store: IStateTreeNode, options?: IOptions): Promise<void>
@@ -12,7 +15,6 @@ export interface IOptions {
   readonly blacklist?: Array<string>,
   readonly transforms?: Array<ITransform>
 }
-type StrToAnyMap = {[key: string]: any}
 
 export interface ITransform {
   readonly toStorage?: ITransformArgs,
@@ -40,19 +42,15 @@ export const persist: IArgs = (name, store, options = {}) => {
   }
 
   if (!jsonify) { jsonify = true } // default to true like mobx-persist
-  const whitelistDict = arrToDict(whitelist)
-  const blacklistDict = arrToDict(blacklist)
+
+  transforms = [
+    ...(whitelist ? [whitelistKeys(whitelist)] : []),
+    ...(blacklist ? [blacklistKeys(blacklist)] : []),
+    ...(transforms || [])
+  ]
 
   onSnapshot(store, (_snapshot: StrToAnyMap) => {
     const snapshot = { ..._snapshot }
-    Object.keys(snapshot).forEach((key) => {
-      if (whitelist && !whitelistDict[key]) {
-        delete snapshot[key]
-      }
-      if (blacklist && blacklistDict[key]) {
-        delete snapshot[key]
-      }
-    })
 
     transforms.forEach((transform) => {
       if (transform.toStorage) { transform.toStorage(snapshot) }
@@ -77,16 +75,6 @@ export const persist: IArgs = (name, store, options = {}) => {
     })
 }
 
-type StrToBoolMap = {[key: string]: boolean}
-
-function arrToDict (arr?: Array<string>): StrToBoolMap {
-  if (!arr) { return {} }
-  return arr.reduce((dict: StrToBoolMap, elem) => {
-    dict[elem] = true
-    return dict
-  }, {})
-}
-
 function isString (value: any): value is string {
   return typeof value === 'string'
 }

src/utils.ts

@@ -0,0 +1,11 @@
+export type StrToAnyMap = {[key: string]: any}
+
+export type StrToBoolMap = {[key: string]: boolean}
+
+export function arrToDict (arr?: Array<string>): StrToBoolMap {
+  if (!arr) { return {} }
+  return arr.reduce((dict: StrToBoolMap, elem) => {
+    dict[elem] = true
+    return dict
+  }, {})
+}

src/whitelistTransform.ts

@@ -0,0 +1,15 @@
+import { arrToDict } from './utils'
+import { ITransform } from './index'
+
+export function whitelistKeys (whitelist?: Array<string>): ITransform {
+  const whitelistDict = arrToDict(whitelist)
+
+  return {toStorage: function whitelistTransform (snapshot) {
+    Object.keys(snapshot).forEach((key) => {
+      if (whitelist && !whitelistDict[key]) {
+        delete snapshot[key]
+      }
+    })
+    return snapshot
+  }}
+}