Detect if snapshot value is an object before adding keyfield

Author: chrisbianca

database/helpers/index.ts

@@ -1,9 +1,16 @@
 import { database } from 'firebase';
+import * as isObject from 'isobject';
 
 export const snapshotToData = (
   snapshot: database.DataSnapshot,
   keyField?: string
-) => ({
-  ...snapshot.val(),
-  ...(keyField ? { [keyField]: snapshot.key } : null),
-});
+) => {
+  const val = snapshot.val();
+  if (isObject(val)) {
+    return {
+      ...val,
+      ...(keyField ? { [keyField]: snapshot.key } : null),
+    };
+  }
+  return val;
+};

package.json

@@ -43,7 +43,9 @@
   },
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
-  "dependencies": {},
+  "dependencies": {
+    "isobject": "^3.0.1"
+  },
   "devDependencies": {
     "@types/react": "^16.8.3",
     "firebase": "^5.5.6",

yarn.lock

@@ -573,6 +573,11 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
 [email protected]:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"