fix: check for plain object before Object.keys call (#27)

* fix: check for plain object before Object.keys call

* fix: tests

* chore: version bump

Author: gjuchault

lib/model/model.js

@@ -1,6 +1,7 @@
 const debug = require('debug')('requelize:model')
 
 const Joi = require('joi')
+const isPlainObject = require('lodash.isplainobject')
 const Query = require('./query')
 const RequelizeError = require('../error')
 const validateSchema = require('./util/validateSchema')
@@ -51,9 +52,11 @@ function createModel (requelize) {
         hiddenProp(this, '_validate', true)
         hiddenProp(this, '_saved', false)
 
-        // Set initial values (must be after getters/setters)
-        for (const key of Object.keys(initialData)) {
-          this[key] = initialData[key]
+        if (isPlainObject(initialData)) {
+          // Set initial values (must be after getters/setters)
+          for (const key of Object.keys(initialData)) {
+            this[key] = initialData[key]
+          }
         }
 
         debug(`instanciating ${Model._name} with data ${JSON.stringify(this._data)}`)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "requelize",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "RethinkDB ORM",
   "main": "index.js",
   "repository": "https://github.com/buckless/requelize.git",
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "debug": "^2.6.3",
+    "lodash.isplainobject": "^4.0.6",
     "rethinkdbdash": "^2.3.28",
     "rxjs": "^5.2.0"
   },

test/test.issue26.js

@@ -0,0 +1,15 @@
+const { test, requelize } = require('./utils')
+
+test('Issue #26', (t) => {
+  t.plan(1)
+
+  const Foo = requelize.model('foo')
+
+  try {
+    let foo = new Foo(null)
+
+    t.equal(true, foo.hasOwnProperty('id'), 'instance is created with null as initialData')
+  } catch (err) {
+    t.fail(err)
+  }
+})

yarn.lock

@@ -821,10 +821,6 @@ [email protected]:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-[email protected]:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.1.0.tgz#4a4557460f69842ed463aa00628cc26d2683afa7"
-
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -992,10 +988,6 @@ isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
-[email protected]:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isemail/-/isemail-2.2.1.tgz#0353d3d9a62951080c262c2aa0a42b8ea8e9e2a6"
-
 isexe@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
@@ -1023,25 +1015,12 @@ istanbul@^0.4.5:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-[email protected]:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/items/-/items-2.1.1.tgz#8bd16d9c83b19529de5aea321acaada78364a198"
-
 jodid25519@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
   dependencies:
     jsbn "~0.1.0"
 
-joi@^10.2.2:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-10.2.2.tgz#dc5a792b7b4c6fffa562242a95b55d9d3f077e24"
-  dependencies:
-    hoek "4.x.x"
-    isemail "2.x.x"
-    items "2.x.x"
-    topo "2.x.x"
-
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
@@ -1124,6 +1103,10 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+
 lodash@^4.0.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -1784,12 +1767,6 @@ through@^2.3.6, through@~2.3.4, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-[email protected]:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
-  dependencies:
-    hoek "4.x.x"
-
 tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"