@kizmann/pico-js 0.3.20 → 0.3.23

package/package.json

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

package/src/utility/object.js

@@ -19,62 +19,82 @@ export class Obj
             return fallback;
         }
 
-        keys = (typeof keys === 'string' && keys.match(/^[^\.]+(\.[^\.]+)*$/)) ?
-            keys.split('.') : keys;
-
-        if ( Any.isArray(keys) === false ) {
-            keys = [keys];
+        if ( keys === null || keys === undefined ) {
+            return fallback;
         }
 
-        let result = [];
-
-        Arr.each(keys, (key) => {
-
-            key = (typeof key === 'string' && key.match(/^[^\.]+(\.[^\.]+)*$/)) ?
-                key.split('.') : key;
+        if ( Any.isArray(keys) ) {
+            keys = keys.join('.');
+        }
 
-            if ( Any.isArray(keys) === false ) {
-                key = [key];
-            }
+        if ( ! Any.isString(keys) ) {
+            keys = keys.toString();
+        }
 
-            result = result.concat(key)
-        });
+        keys = keys.split('.');
 
-        let key = result.shift();
+        let index = 0, length = keys.length;
 
-        if ( typeof obj[key] === 'undefined' ) {
+        if ( length === 0 ) {
             return fallback;
         }
 
-        if ( result.length === 0 ) {
-            return obj[key];
+        while (obj !== undefined && obj !== null && index < length) {
+            obj = obj[keys[index++]];
+        }
+
+        if ( obj === undefined || obj === null) {
+            return fallback;
         }
 
-        return this.get(obj[key], result, fallback);
+        return obj;
     }
 
     static set(obj, keys, val)
     {
-        keys = (typeof keys === 'string' && keys.match(/^[^\.]+(\.[^\.]+)*$/)) ?
-            keys.split('.') : keys;
+        if ( Any.isArray(keys) ) {
+            keys = keys.join('.');
+        }
 
-        let key = keys.shift();
+        if ( ! Any.isString(keys) ) {
+            keys = keys.toString();
+        }
+
+        keys = keys.split('.');
+
+        let index = 0, length = keys.length, nested = obj;
 
-        if ( obj[key] === undefined || obj[key] === null ) {
-            obj[key] = {};
+        if ( length === 0 ) {
+            return obj;
         }
 
-        if ( keys.length === 0 ) {
-            return obj[key] = val;
+        while (nested !== null && index < length) {
+
+            if ( nested[keys[index]] === undefined || nested[keys[index]] === null ) {
+                nested[keys[index]] = {};
+            }
+
+            if ( index == length - 1 ) {
+                nested[keys[index]] = val;
+            }
+
+            nested = nested[keys[index++]];
         }
 
-        return this.set(obj[key], keys, val);
+        return obj;
     }
 
     static unset(obj, keys)
     {
-        keys = (typeof keys === 'string' && keys.match(/^[^\.]+(\.[^\.]+)*$/)) ?
-            keys.split('.') : keys;
+        if ( Any.isArray(keys) ) {
+            keys = keys.join('.');
+        }
+
+        if ( ! Any.isString(keys) ) {
+            keys = keys.toString();
+        }
+
+        keys = keys.split('.');
 
         let key = keys.shift();