Merge pull request #36 from MechJosh0/master

Options to remove array elements and reindex the array

Author: rhalff

dist/dot-object.js

@@ -180,7 +180,7 @@
      * @param {Object} obj
      * @param {Boolean} remove
      */
-    DotObject.prototype.pick = function(path, obj, remove) {
+    DotObject.prototype.pick = function(path, obj, remove, reindexRemove) {
         var i
         var keys
         var val
@@ -194,7 +194,11 @@
                 if (i === (keys.length - 1)) {
                     if (remove) {
                         val = obj[key]
-                        delete obj[key]
+                        if (reindexRemove) {
+                            obj.splice(key, 1)
+                        } else {
+                            delete obj[key]
+                        }
                         if (Array.isArray(obj)) {
                             cp = keys.slice(0, -1).join('.')
                             if (this.cleanup.indexOf(cp) === -1) {
@@ -228,18 +232,18 @@
      * @param {Object} obj
      * @return {Mixed} The removed value
      */
-    DotObject.prototype.remove = function(path, obj) {
+    DotObject.prototype.remove = function(path, obj, reindexRemove) {
         var i
 
         this.cleanup = []
         if (Array.isArray(path)) {
             for (i = 0; i < path.length; i++) {
-                this.pick(path[i], obj, true)
+                this.pick(path[i], obj, true, reindexRemove)
             }
             this._cleanup(obj)
             return obj
         } else {
-            return this.pick(path, obj, true)
+            return this.pick(path, obj, true, reindexRemove)
         }
     }
 

dist/dot-object.min.js

@@ -13,32 +13,35 @@ var DEST = 'dist/'
 
 var paths = ['gulpfile.js', 'src/dot-object.js', 'test/**/*.js']
 
-gulp.task('lint', function () {
+gulp.task('lint', function (done) {
   gulp.src(paths)
     .pipe(standard())
     .pipe(standard.reporter('default', {
       breakOnError: true
     }))
+  done()
 })
 
-gulp.task('mocha', function () {
+gulp.task('mocha', function (done) {
   gulp.src(['test/**/*.js'])
     .pipe(mocha())
     .on('error', gutil.log)
+  done()
 })
 
 gulp.task('watch', function () {
-  gulp.watch(paths, ['build-node', 'mocha'])
+  gulp.watch(paths, gulp.series('build-node', 'mocha'))
 })
 
-gulp.task('build-node', function () {
+gulp.task('build-node', function (done) {
   gulp.src('src/dot-object.js')
     .pipe(hf.footer('\nmodule.exports = DotObject\n'))
     .pipe(rename({ basename: 'index' }))
     .pipe(gulp.dest('./'))
+  done()
 })
 
-gulp.task('build-bower', function () {
+gulp.task('build-bower', function (done) {
   gulp.src('src/dot-object.js')
     .pipe(hf.header('src/header.tpl'))
     .pipe(hf.footer('src/footer.tpl'))
@@ -47,10 +50,11 @@ gulp.task('build-bower', function () {
     .pipe(uglify())
     .pipe(rename({ extname: '.min.js' }))
     .pipe(gulp.dest(DEST))
+  done()
 })
 
-gulp.task('dist', ['lint', 'build-node', 'mocha', 'build-bower'])
+gulp.task('dist', gulp.parallel('lint', 'build-node', 'mocha', 'build-bower'))
 
-gulp.task('test', ['lint', 'build-node', 'mocha'])
+gulp.task('test', gulp.parallel('lint', 'build-node', 'mocha'))
 
-gulp.task('default', ['test'])
+gulp.task('default', gulp.parallel('test'))

gulpfile.js

@@ -178,7 +178,7 @@ DotObject.prototype.str = function (path, v, obj, mod) {
  * @param {Object} obj
  * @param {Boolean} remove
  */
-DotObject.prototype.pick = function (path, obj, remove) {
+DotObject.prototype.pick = function (path, obj, remove, reindexArray) {
   var i
   var keys
   var val
@@ -192,7 +192,11 @@ DotObject.prototype.pick = function (path, obj, remove) {
       if (i === (keys.length - 1)) {
         if (remove) {
           val = obj[key]
-          delete obj[key]
+          if (reindexArray && Array.isArray(obj)) {
+            obj.splice(key, 1)
+          } else {
+            delete obj[key]
+          }
           if (Array.isArray(obj)) {
             cp = keys.slice(0, -1).join('.')
             if (this.cleanup.indexOf(cp) === -1) {
@@ -224,18 +228,18 @@ DotObject.prototype.pick = function (path, obj, remove) {
  * @param {Object} obj
  * @return {Mixed} The removed value
  */
-DotObject.prototype.remove = function (path, obj) {
+DotObject.prototype.remove = function (path, obj, reindexArray) {
   var i
 
   this.cleanup = []
   if (Array.isArray(path)) {
     for (i = 0; i < path.length; i++) {
-      this.pick(path[i], obj, true)
+      this.pick(path[i], obj, true, reindexArray)
     }
     this._cleanup(obj)
     return obj
   } else {
-    return this.pick(path, obj, true)
+    return this.pick(path, obj, true, reindexArray)
   }
 }