solving conflicts to merge

Author: rodriigovieira

lib/index.js

@@ -89,8 +89,6 @@ export function createPersistMachine(structure, store, debug) {
  */
  _map(structure, (object, name) => {
  // Catch any errors with the persist configuration
- if (_isNil(object.values))
- throw new Error("You need to define a `values` array in your persist object.");
  if (_isNil(object.key))
  throw new Error("You need to define a `key` value to identify your data in your persist object.");
  // Get the static key for mapping
@@ -131,6 +129,12 @@ export function createPersistMachine(structure, store, debug) {
  * we care about, which are defined in structure.
  */
  const newState = _pickBy(state, (value, key) => {
+ /**
+ * If nothing is passed to the `values`
+ * parameter, all values will be used.
+ */
+ if (_isNil(stateValues))
+ return value;
  if (stateValues.includes(key))
  return value;
  });

lib/index.ts

@@ -90,14 +90,13 @@ export const persistMiddleware = (save: SaveCallback, load: LoadCallback) => (ne
  * @param debug - Debug data to the console
  *
  */
-export function createPersistMachine(structure: any, store: any, debug: boolean) {
+export function createPersistMachine(structure : any, store : any, debug: boolean) {
  /*
  * We do an initial map of the structure
  */
  _map(structure, (object: any, name: any) => {
  // Catch any errors with the persist configuration
- if (_isNil(object.values)) throw new Error("You need to define a `values` array in your persist object.");
- if (_isNil(object.key)) throw new Error("You need to define a `key` value to identify your data in your persist object.");
+ if(_isNil(object.key)) throw new Error("You need to define a `key` value to identify your data in your persist object.");
 
  // Get the static key for mapping
  const {
@@ -146,7 +145,13 @@ export function createPersistMachine(structure: any, store: any, debug: boolean)
  * Builds a state only containing the values
  * we care about, which are defined in structure.
  */
- const newState = _pickBy(state, (value: any, key: any) => {
+ const newState = _pickBy(state, (value : any, key : any) => {
+ /**
+ * If nothing is passed to the `values`
+ * parameter, all values will be used.
+ */
+ if (_isNil(stateValues)) return value;
+ 
  if (stateValues.includes(key)) return value;
  });