@valkyriestudios/utils 11.5.0 → 11.7.0

package/deep/freeze.d.ts

@@ -3,6 +3,9 @@ type deepInput = {
 } | {
     [key: string]: any;
 }[] | any[];
+type Frozen<T> = {
+    readonly [K in keyof T]: Frozen<T[K]>;
+};
 /**
  * Recursively freezes all properties of an object
  *
@@ -10,5 +13,5 @@ type deepInput = {
  *
  * @returns Deeply frozen object
  */
-export default function deepFreeze(obj: deepInput): Readonly<deepInput>;
+export default function deepFreeze<T extends deepInput>(obj: T): Frozen<T>;
 export {};

package/deep/seal.d.ts

@@ -3,6 +3,9 @@ type deepInput = {
 } | {
     [key: string]: any;
 }[] | any[];
+type Sealed<T> = {
+    [K in keyof T]: Sealed<T[K]>;
+};
 /**
  * Recursively seals all properties of an object
  *
@@ -10,5 +13,5 @@ type deepInput = {
  *
  * @returns Deeply sealed object
  */
-export default function deepSeal(obj: deepInput): deepInput;
+export default function deepSeal<T extends deepInput>(obj: T): Sealed<T>;
 export {};

package/index.d.ts

@@ -261,7 +261,10 @@ declare module "deep/freeze" {
     } | {
         [key: string]: any;
     }[] | any[];
-    export default function deepFreeze(obj: deepInput): Readonly<deepInput>;
+    type Frozen<T> = {
+        readonly [K in keyof T]: Frozen<T[K]>;
+    };
+    export default function deepFreeze<T extends deepInput>(obj: T): Frozen<T>;
 }
 declare module "deep/get" {
     export default function deepGet(obj: {
@@ -276,7 +279,10 @@ declare module "deep/seal" {
     } | {
         [key: string]: any;
     }[] | any[];
-    export default function deepSeal(obj: deepInput): deepInput;
+    type Sealed<T> = {
+        [K in keyof T]: Sealed<T[K]>;
+    };
+    export default function deepSeal<T extends deepInput>(obj: T): Sealed<T>;
 }
 declare module "deep/set" {
     export default function deepSet(obj: {

package/object/merge.js

@@ -1,20 +1,14 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+const PROTO_OBJ = '[object Object]';
 function merge(target, source = {}) {
-    if (Object.prototype.toString.call(target) !== '[object Object]' ||
-        Object.prototype.toString.call(source) !== '[object Object]')
+    if (Object.prototype.toString.call(target) !== PROTO_OBJ ||
+        Object.prototype.toString.call(source) !== PROTO_OBJ)
         throw new TypeError('Please pass a target and object to merge');
     const acc = {};
     for (const key in target) {
-        if (!Object.prototype.hasOwnProperty.call(target, key))
-            continue;
-        if (typeof target[key] === 'object' &&
-            target[key] !== null &&
-            !Array.isArray(target[key]) &&
-            Object.prototype.hasOwnProperty.call(source, key) &&
-            typeof source[key] === 'object' &&
-            source[key] !== null &&
-            !Array.isArray(source[key])) {
+        if (Object.prototype.toString.call(target[key]) === PROTO_OBJ &&
+            Object.prototype.toString.call(source[key]) === PROTO_OBJ) {
             acc[key] = merge(target[key], source[key]);
         }
         else {

package/object/pick.js

@@ -8,25 +8,22 @@ function pick(obj, keys) {
         keys.length === 0)
         throw new TypeError('Please pass an object to pick from and a keys array');
     const map = {};
-    let key_deep = false;
     let val;
+    let sanitized;
     for (const key of keys) {
         if (typeof key !== 'string')
             continue;
-        const sanitized = key.trim();
+        sanitized = key.trim();
         if (sanitized.length === 0)
             continue;
-        key_deep = /(\.|\[)/g.test(sanitized);
-        val = key_deep
-            ? (0, get_1.default)(obj, sanitized)
-            : obj[sanitized];
-        if (val === undefined)
-            continue;
-        if (key_deep) {
+        if (/(\.|\[)/g.test(sanitized)) {
+            val = (0, get_1.default)(obj, sanitized);
+            if (val === undefined)
+                continue;
             (0, set_1.default)(map, sanitized, val);
         }
-        else {
-            map[sanitized] = val;
+        else if (obj[sanitized] !== undefined) {
+            map[sanitized] = obj[sanitized];
         }
     }
     return map;

package/package.json

@@ -1 +1 @@
-{ "name": "@valkyriestudios/utils", "version": "11.5.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "email": "contact@valkyriestudios.be", "url": "www.valkyriestudios.be" }, "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": "11.7.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "email": "contact@valkyriestudios.be", "url": "www.valkyriestudios.be" }, "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" }