@valkyriestudios/utils 12.28.0 → 12.29.0

package/deep/get.d.ts

@@ -18,9 +18,9 @@ type DeepGetResult<T extends ObjectType | ArrayType, P extends string> = P exten
  * Output:
  * 2
  *
- * @param val - Object/Array to get the value from
- * @param path - Path string to deeply get the value at
- * @param get_parent - If passed as true retrieves the parent of where the value lives
+ * @param {Record<string, unknown>|unknown[]} obj - Object/Array to get the value from
+ * @param {string} path - Path string to deeply get the value at
+ * @param {boolean} get_parent - If passed as true retrieves the parent of where the value lives
  * @throws {TypeError}
  */
 declare function deepGet<T extends ObjectType | ArrayType, P extends string>(obj: T, path: P, get_parent?: boolean): DeepGetResult<T, P> | undefined;

package/deep/get.js

@@ -5,60 +5,63 @@ exports.default = deepGet;
 function deepGet(obj, path, get_parent = false) {
     if (Object.prototype.toString.call(obj) !== '[object Object]' &&
         !Array.isArray(obj))
-        throw new TypeError('Deepget is only supported for objects');
-    if (typeof path !== 'string')
-        throw new TypeError('No path was given');
-    const path_s = path.trim();
-    const path_len = path_s.length;
-    if (!path_len)
-        throw new TypeError('No path was given');
-    const parts = [];
-    let cursor_part = '';
-    let in_bracket = false;
-    for (let i = 0; i < path_len; i++) {
-        const char = path_s[i];
-        if (char === '[' || char === ']') {
-            in_bracket = !in_bracket;
-            if (cursor_part) {
-                parts.push(cursor_part);
-                cursor_part = '';
-            }
+        throw new TypeError('deepGet: Requires object or array');
+    if (typeof path !== 'string' ||
+        !path.length)
+        throw new TypeError('deepGet: Invalid path provided');
+    const nodes = [];
+    let node = obj;
+    let key = '';
+    for (let i = 0; i < path.length; i++) {
+        const char = path[i];
+        switch (char) {
+            case '[':
+            case ']':
+            case '.':
+                if (!key)
+                    break;
+                if (Array.isArray(node)) {
+                    const ix = parseInt(key, 10);
+                    if (ix < 0 || ix > node.length - 1)
+                        return undefined;
+                    node = node[ix];
+                    nodes.push(node);
+                }
+                else if (typeof node === 'object' && node !== null) {
+                    node = node[key];
+                    nodes.push(node);
+                    if (node === undefined)
+                        return undefined;
+                }
+                else {
+                    return undefined;
+                }
+                key = '';
+                break;
+            default:
+                key += char;
+                break;
         }
-        else if (char === '.' && !in_bracket) {
-            if (cursor_part) {
-                parts.push(cursor_part);
-                cursor_part = '';
-            }
-        }
-        else {
-            cursor_part += char;
-        }
-    }
-    if (cursor_part)
-        parts.push(cursor_part);
-    let len = parts.length;
-    if (!len || (len === 1 && get_parent))
-        return obj;
-    if (get_parent) {
-        parts.pop();
-        len -= 1;
     }
-    let cursor = obj;
-    for (let i = 0; i < len; i++) {
-        if (Array.isArray(cursor)) {
-            const ix = parseInt(parts[i], 10);
-            if (ix < 0 || ix > cursor.length - 1)
+    if (key) {
+        if (Array.isArray(node)) {
+            const ix = parseInt(key, 10);
+            if (ix < 0 || ix > node.length - 1)
                 return undefined;
-            cursor = cursor[ix];
+            node = node[ix];
+            nodes.push(node);
         }
-        else if (Object.prototype.toString.call(cursor) === '[object Object]') {
-            cursor = cursor[parts[i]];
-            if (cursor === undefined)
+        else if (typeof node === 'object' && node !== null) {
+            node = node[key];
+            nodes.push(node);
+            if (node === undefined)
                 return undefined;
         }
         else {
             return undefined;
         }
     }
-    return cursor;
+    if (get_parent)
+        nodes.pop();
+    return nodes.length ? nodes.pop() : obj;
 }

package/package.json

@@ -1 +1 @@
-{ "name": "@valkyriestudios/utils", "version": "12.28.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "url": "https://www.linkedin.com/in/petervermeulen1/" }, "keywords": [ "utility", "library", "javascript", "js", "node", "bun" ], "license": "MIT", "repository": { "type": "git", "url": "git+https://github.com/ValkyrieStudios/utils.git" }, "bugs": { "url": "https://github.com/ValkyrieStudios/utils/issues" }, "homepage": "https://github.com/ValkyrieStudios/utils#readme", "types": "index.d.ts" }
+{ "name": "@valkyriestudios/utils", "version": "12.29.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "url": "https://www.linkedin.com/in/petervermeulen1/" }, "keywords": [ "utility", "library", "javascript", "js", "node", "bun" ], "license": "MIT", "repository": { "type": "git", "url": "git+https://github.com/ValkyrieStudios/utils.git" }, "bugs": { "url": "https://github.com/ValkyrieStudios/utils/issues" }, "homepage": "https://github.com/ValkyrieStudios/utils#readme", "types": "index.d.ts" }