@kizmann/pico-js 0.3.18 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "0.3.18",
+    "version": "0.3.21",
     "license": "MIT",
     "private": false,
     "author": "Eduard Kizmann <kizmann@protonmail.ch>",

package/src/utility/object.js

@@ -19,24 +19,31 @@ export class Obj
             return fallback;
         }
 
-        keys = (typeof keys === 'string' && keys.match(/^[^\.]+(\.[^\.]+)*$/)) ?
-            keys.split('.') : keys;
+        if ( keys === null || keys === undefined ) {
+            return obj;
+        }
 
-        if ( Any.isArray(keys) === false ) {
-            keys = [keys];
+        if ( Any.isArray(keys) ) {
+            keys = keys.join('.');
         }
 
-        let key = keys.shift();
+        if ( ! Any.isString(keys) ) {
+            keys = keys.toString();
+        }
 
-        if ( typeof obj[key] === 'undefined' ) {
-            return fallback;
+        keys = keys.split('.');
+
+        let index = 0, length = keys.length;
+
+        while (obj !== undefined && index < length) {
+            obj = obj[keys[index++]];
         }
 
-        if ( keys.length === 0 ) {
-            return obj[key];
+        if ( typeof obj === 'undefined' ) {
+            return fallback;
         }
 
-        return this.get(obj[key], keys, fallback)
+        return obj;
     }
 
     static set(obj, keys, val)
@@ -86,7 +93,7 @@ export class Obj
             }
         });
 
-        if ( ! Any.isEmpty(assign) ) {
+        if ( !Any.isEmpty(assign) ) {
             result = this.assign(result, assign);
         }
 
@@ -103,7 +110,7 @@ export class Obj
             }
         });
 
-        if ( ! Any.isEmpty(assign) ) {
+        if ( !Any.isEmpty(assign) ) {
             result = this.assign(result, assign);
         }
 
@@ -148,7 +155,7 @@ export class Obj
             });
         }
 
-        if ( ! Any.isFunction(key) ) {
+        if ( !Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {
                 return Any.integer(Obj.get(obj[a], key)) - Any.integer(Obj.get(obj[b], key));
             })
@@ -168,13 +175,13 @@ export class Obj
     {
         let keys = Any.keys(obj);
 
-        if ( ! Any.isFunction(key) ) {
+        if ( !Any.isFunction(key) ) {
             keys = keys.sort((a, b) => {
 
                 let va = Any.string(Obj.get(obj[a], key)).toLowerCase();
                 let vb = Any.string(Obj.get(obj[b], key)).toLowerCase();
 
-                return(va < vb) ? -1 : (va > vb) ? 1 : 0;
+                return (va < vb) ? - 1 : (va > vb) ? 1 : 0;
             })
         }
 
@@ -265,8 +272,7 @@ export class Obj
 
         if ( obj instanceof FormData ) {
 
-            for (let [key, value] of obj.entries())
-            {
+            for ( let [key, value] of obj.entries() ) {
                 result[key] = callback(value, key);
             }