fix(patches): fixed possible nullpointer

BowlingX · Dec 19, 2019 · 12b339f · 12b339f
1 parent 11c947d
commit 12b339f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -90,10 +90,9 @@ export const createQueriesFromPatch = <T = object>(
       return next
     }
     const possibleParameter = get(config, objectPath)
-    if (
-      possibleParameter !== undefined &&
-      typeof possibleParameter !== 'function'
-    ) {
+    const isNotCallable = typeof possibleParameter !== 'function'
+
+    if (possibleParameter !== undefined && isNotCallable) {
       // If we have an object as result, we create patches for each parameter inside the subtree
       const patches = findDeepPatches(
         possibleParameter,
@@ -104,6 +103,11 @@ export const createQueriesFromPatch = <T = object>(
         ...createQueriesFromPatch<T>(config, ns, patches, state, initialState)
       }
     }
+
+    if (isNotCallable) {
+      return next
+    }
+
     const { name, serializer, skip } = possibleParameter()
     // @ts-ignore
     const value = get(state, objectPath)