object-path - npm Package Compare versions

Comparing version 0.2.1 to 0.3.0

bower.json

 {
   "name": "object-path",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "main": "index.js",
@@ -13,6 +13,6 @@ "keywords": [
   "ignore" : [
-    "test.js", 
-    "coverage", 
+    "test.js",
+    "coverage",
     "*.yml"
   ]
 }

index.js

@@ -62,2 +62,3 @@ (function (root, factory){
     var currentPath = getKey(path[0]);
+
     if (path.length === 1) {
@@ -69,14 +70,13 @@ var oldVal = obj[currentPath];
       return oldVal;
-    } else if (path.length > 1) {
-      if (obj[currentPath] === void 0) {
-        if (isNumber(currentPath)) {
-          obj[currentPath] = [];
-        } else {
-          obj[currentPath] = {};
-        }
+    }
+
+    if (obj[currentPath] === void 0) {
+      if (isNumber(currentPath)) {
+        obj[currentPath] = [];
+      } else {
+        obj[currentPath] = {};
       }
-      return set(obj[currentPath], path.slice(1), value, doNotReplace);
     }
 
-    return undefined;
+    return set(obj[currentPath], path.slice(1), value, doNotReplace);
   }
@@ -94,2 +94,3 @@
     }
+
     var currentPath = getKey(path[0]);
@@ -100,3 +101,3 @@ var oldVal = obj[currentPath];
       if (oldVal !== void 0) {
-        if (isArray(obj[currentPath])) {
+        if (isArray(obj)) {
           obj.splice(currentPath, 1);
@@ -107,3 +108,3 @@ } else {
       }
-    } else if (path.length > 1) {
+    } else {
       if (obj[currentPath] !== void 0) {
@@ -116,3 +117,3 @@ return del(obj[currentPath], path.slice(1));
   }
-  
+
   var objectPath = {};
@@ -138,3 +139,3 @@
 
-  objectPath.get = function (obj, path){
+  objectPath.get = function (obj, path, defaultValue){
     if (isEmpty(path)) {
@@ -144,12 +145,17 @@ return obj;
     if (isEmpty(obj)) {
-      return undefined;
+      return defaultValue;
     }
     if (isString(path)) {
-      return objectPath.get(obj, path.split('.'));
+      return objectPath.get(obj, path.split('.'), defaultValue);
     }
     var currentPath = getKey(path[0]);
+
     if (path.length === 1) {
+      if (obj[currentPath] === void 0) {
+        return defaultValue;
+      }
       return obj[currentPath];
     }
-    return objectPath.get(obj[currentPath], path.slice(1));
+
+    return objectPath.get(obj[currentPath], path.slice(1), defaultValue);
   };
@@ -156,0 +162,0 @@

package.json

 {
   "name": "object-path",
   "description": "Access deep properties using a path",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "author": {
@@ -6,0 +6,0 @@ "name": "Mario Casciaro"

test.js

@@ -19,28 +19,75 @@ var expect = require('chai').expect,
   it('should return the value under shallow object', function() {
-    expect(objectPath.get(getTestObj(), "a")).to.be.equal("b");
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "a")).to.be.equal("b");
+    expect(objectPath.get(obj, ["a"])).to.be.equal("b");
   });
 
   it('should return the value under deep object', function() {
-    expect(objectPath.get(getTestObj(), "b.f")).to.be.equal("i");
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "b.f")).to.be.equal("i");
+    expect(objectPath.get(obj, ["b","f"])).to.be.equal("i");
   });
 
   it('should return the value under array', function() {
-    expect(objectPath.get(getTestObj(), "b.d.0")).to.be.equal("a");
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "b.d.0")).to.be.equal("a");
+    expect(objectPath.get(obj, ["b","d",0])).to.be.equal("a");
   });
 
   it('should return the value under array deep', function() {
-    expect(objectPath.get(getTestObj(), "b.e.1.f")).to.be.equal("g");
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "b.e.1.f")).to.be.equal("g");
+    expect(objectPath.get(obj, ["b","e",1,"f"])).to.be.equal("g");
   });
 
   it('should return undefined for missing values under object', function() {
-    expect(objectPath.get(getTestObj(), "a.b")).to.not.exist;
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "a.b")).to.not.exist;
+    expect(objectPath.get(obj, ["a","b"])).to.not.exist;
   });
 
   it('should return undefined for missing values under array', function() {
-    expect(objectPath.get(getTestObj(), "b.d.5")).to.not.exist;
+    var obj = getTestObj();
+    expect(objectPath.get(obj, "b.d.5")).to.not.exist;
+    expect(objectPath.get(obj, ["b","d","5"])).to.not.exist;
   });
 
   it('should return the value under integer-like key', function() {
-    expect(objectPath.get({ "1a": "foo" }, "1a")).to.be.equal("foo");
+    var obj = { "1a": "foo" };
+    expect(objectPath.get(obj, "1a")).to.be.equal("foo");
+    expect(objectPath.get(obj, ["1a"])).to.be.equal("foo");
   });
+
+  it('should return the default value when the key doesnt exist', function() {
+    var obj = { "1a": "foo" };
+    expect(objectPath.get(obj, "1b", null)).to.be.equal(null);
+    expect(objectPath.get(obj, ["1b"], null)).to.be.equal(null);
+  });
+
+  it('should return the default value when path is empty', function() {
+    var obj = { "1a": "foo" };
+    expect(objectPath.get(obj, "", null)).to.be.deep.equal({ "1a": "foo" });
+    expect(objectPath.get(obj, [])).to.be.deep.equal({ "1a": "foo" });
+    expect(objectPath.get({  }, ["1"])).to.be.equal(undefined);
+  });
+
+  it('should skip non own properties with isEmpty', function(){
+    var Base = function(enabled){ };
+    Base.prototype = {
+      one: {
+        two: true
+      }
+    };
+    var Extended = function(){
+      Base.call(this,  true);
+    };
+    Extended.prototype = Object.create(Base.prototype);
+
+    var extended = new Extended();
+
+    expect(objectPath.get(extended, ['one','two'])).to.be.equal(undefined);
+    extended.enabled = true;
+
+    expect(objectPath.get(extended, 'enabled')).to.be.equal(true);
+  });
 });
@@ -54,2 +101,5 @@
     expect(obj).to.have.deep.property("c.m", "o");
+    obj = getTestObj();
+    objectPath.set(obj, ["c"], {m: "o"});
+    expect(obj).to.have.deep.property("c.m", "o");
   });
@@ -61,2 +111,5 @@
     expect(obj).to.have.deep.property("b.c", "o");
+    obj = getTestObj();
+    objectPath.set(obj, ["b","c"], "o");
+    expect(obj).to.have.deep.property("b.c", "o");
   });
@@ -68,2 +121,5 @@
     expect(obj).to.have.deep.property("b.e.1.g", "f");
+    obj = getTestObj();
+    objectPath.set(obj, ["b","e",1,"g"], "f");
+    expect(obj).to.have.deep.property("b.e.1.g", "f");
   });
@@ -75,2 +131,5 @@
     expect(obj).to.have.deep.property("c.d.e.f", "l");
+    obj = getTestObj();
+    objectPath.set(obj, ["c","d","e","f"], "l");
+    expect(obj).to.have.deep.property("c.d.e.f", "l");
   });
@@ -83,2 +142,6 @@
     expect(obj).to.have.deep.property("c.0.1.m", "l");
+    obj = getTestObj();
+    objectPath.set(obj, ["c","0",1,"m"], "l");
+    expect(obj.c[0]).to.be.an("array");
+    expect(obj).to.have.deep.property("c.0.1.m", "l");
   });
@@ -90,2 +153,5 @@
     expect(obj).to.have.deep.property("1a", "foo");
+    obj = getTestObj();
+    objectPath.set(obj, ["1a"], "foo");
+    expect(obj).to.have.deep.property("1a", "foo");
   });
@@ -97,2 +163,5 @@
     expect(obj[0]).to.be.equal("foo");
+    obj = [];
+    objectPath.set(obj, "0", "foo");
+    expect(obj[0]).to.be.equal("foo");
   });
@@ -107,2 +176,5 @@ });
     expect(obj).to.have.deep.property("b.c.0", "l");
+    obj = getTestObj();
+    objectPath.push(obj, ["b","c"], "l");
+    expect(obj).to.have.deep.property("b.c.0", "l");
   });
@@ -114,2 +186,5 @@
     expect(obj).to.have.deep.property("b.h.0", "l");
+    obj = getTestObj();
+    objectPath.push(obj, ["b","h"], "l");
+    expect(obj).to.have.deep.property("b.h.0", "l");
   });
@@ -138,22 +213,53 @@ });
 describe('del', function(){
+  it('should return undefined on empty object', function(){
+    expect(objectPath.del({}, 'a')).to.equal(undefined);
+  });
+
   it('should delete deep paths', function(){
     var obj = getTestObj();
 
+    expect(objectPath.del(obj)).to.be.equal(obj);
 
+    objectPath.set(obj, 'b.g.1.0', "test");
     objectPath.set(obj, 'b.g.1.1', "test");
-    objectPath.set(obj, 'b.g.1.2', "test");
+    objectPath.set(obj, 'b.h.az', "test");
+
+    expect(obj).to.have.deep.property("b.g.1.0","test");
     expect(obj).to.have.deep.property("b.g.1.1","test");
-    expect(obj).to.have.deep.property("b.g.1.2","test");
+    expect(obj).to.have.deep.property("b.h.az","test");
 
-    expect(objectPath.del(obj)).to.be.equal(obj);
+    objectPath.del(obj, 'b.h.az');
+    expect(obj).to.not.have.deep.property("b.h.az");
+    expect(obj).to.have.deep.property("b.h");
 
     objectPath.del(obj, 'b.g.1.1');
     expect(obj).to.not.have.deep.property("b.g.1.1");
-    expect(obj).to.have.deep.property("b.g.1.2","test");
-    objectPath.del(obj, ['b','g','1','2']);
-    expect(obj).to.not.have.deep.property("b.g.1.2");
+    expect(obj).to.have.deep.property("b.g.1.0","test");
+
+    objectPath.del(obj, ['b','g','1','0']);
+    expect(obj).to.not.have.deep.property("b.g.1.0");
     expect(obj).to.have.deep.property("b.g.1");
+
     expect(objectPath.del(obj, ['b'])).to.not.have.deep.property("b.g");
     expect(obj).to.be.deep.equal({'a':'b'});
   });
+
+  it('should remove items from existing array', function(){
+    var obj = getTestObj();
+
+    objectPath.del(obj, 'b.d.0');
+    expect(obj.b.d).to.have.length(1);
+    expect(obj.b.d).to.be.deep.equal(['b']);
+
+    objectPath.del(obj, 'b.d.0');
+    expect(obj.b.d).to.have.length(0);
+    expect(obj.b.d).to.be.deep.equal([]);
+  });
+
+  it('should skip undefined paths', function(){
+    var obj = getTestObj();
+
+    expect(objectPath.del(obj, 'do.not.exist')).to.be.equal(obj);
+    expect(objectPath.del(obj, 'a.c')).to.be.equal('b');
+  });
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

15991

increased by29.57%

Lines of code

361

increased by34.2%

No dependency changes