Merge branch 'release/v1.8.1'

rhalff · Jul 18, 2019 · 295c17e · 295c17e
2 parents 3e78944 + fa5fe12
commit 295c17e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 2019-07-18 Version 1.8.1
+* allows allow to set root level property using dot.str
+
 ## 2019-07-18 Version 1.8.0
 * [[`cdc691424b`](https://github.com/rhalff/dot-object/commit/cdc691424b)] - Options to remove array elements and reindex the array. (Fixed by MechJosh0 #36)
 

diff --git a/bower.json b/bower.json
@@ -25,7 +25,7 @@
     "type": "git",
     "url": "git://github.com/rhalff/dot-object.git"
   },
-  "version": "1.8.0",
+  "version": "1.8.1",
   "homepage": "https://github.com/rhalff/dot-object",
   "moduleType": [
     "amd",

diff --git a/dist/dot-object.js b/dist/dot-object.js
@@ -165,7 +165,7 @@
     DotObject.prototype.str = function(path, v, obj, mod) {
         if (path.indexOf(this.separator) !== -1) {
             this._fill(path.split(this.separator), obj, v, mod)
-        } else if (!hasOwnProperty.call(obj, path) || this.override) {
+        } else {
             obj[path] = _process(v, mod)
         }
 

diff --git a/dist/dot-object.min.js b/dist/dot-object.min.js
diff --git a/index.js b/index.js
@@ -163,7 +163,7 @@ DotObject.prototype.object = function (obj, mods) {
 DotObject.prototype.str = function (path, v, obj, mod) {
   if (path.indexOf(this.separator) !== -1) {
     this._fill(path.split(this.separator), obj, v, mod)
-  } else if (!hasOwnProperty.call(obj, path) || this.override) {
+  } else {
     obj[path] = _process(v, mod)
   }
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dot-object",
   "description": "dot-object makes it possible to transform and read (JSON) objects using dot notation.",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "author": {
     "name": "Rob Halff",
     "email": "rob.halff@gmail.com"

diff --git a/src/dot-object.js b/src/dot-object.js
@@ -163,7 +163,7 @@ DotObject.prototype.object = function (obj, mods) {
 DotObject.prototype.str = function (path, v, obj, mod) {
   if (path.indexOf(this.separator) !== -1) {
     this._fill(path.split(this.separator), obj, v, mod)
-  } else if (!hasOwnProperty.call(obj, path) || this.override) {
+  } else {
     obj[path] = _process(v, mod)
   }
 

diff --git a/test/str.js b/test/str.js
@@ -23,4 +23,12 @@ describe('str:', function () {
       }
     })
   })
+
+  it('can set root level property regardless whether override is set', function () {
+    Dot.str('a', 'b', {
+      a: 1
+    }).should.deepEqual({
+      a: 'b'
+    })
+  })
 })