@valkyriestudios/utils 11.4.0 → 11.6.0

package/array/dedupe.js

@@ -4,14 +4,14 @@ const fnv1A_1 = require("../hash/fnv1A");
 function dedupe(val) {
     if (!Array.isArray(val) || val.length === 0)
         return [];
-    const map = new Map();
+    const set = new Set();
     const acc = [];
     let hash;
     for (const item of val) {
         hash = (0, fnv1A_1.default)(item);
-        if (map.has(hash))
+        if (set.has(hash))
             continue;
-        map.set(hash, true);
+        set.add(hash);
         acc.push(item);
     }
     return acc;

package/array/join.js

@@ -4,12 +4,12 @@ const round_1 = require("../number/round");
 function join(val, opts = {}) {
     if (!Array.isArray(val) || val.length === 0)
         return '';
-    const OPTS = Object.assign({
+    const OPTS = {
         delim: ' ',
         trim: true,
         valtrim: true,
-        valround: false,
-    }, Object.prototype.toString.call(opts) === '[object Object]' ? opts : {});
+        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
+    };
     const filtered = [];
     for (const el of val) {
         if (typeof el === 'string' && el.trim().length > 0) {

package/array/mapFn.js

@@ -4,9 +4,10 @@ function mapFn(arr, fn, opts = {}) {
     if ((!Array.isArray(arr) || arr.length === 0) ||
         typeof fn !== 'function')
         return {};
-    const OPTS = Object.assign({
+    const OPTS = {
         merge: false,
-    }, Object.prototype.toString.call(opts) === '[object Object]' ? opts : {});
+        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
+    };
     const map = {};
     let hash = false;
     for (const el of arr) {
@@ -17,7 +18,7 @@ function mapFn(arr, fn, opts = {}) {
             continue;
         hash = `${hash}`;
         if (OPTS.merge === true && map.hasOwnProperty(hash)) {
-            map[hash] = Object.assign(map[hash], el);
+            map[hash] = { ...map[hash], ...el };
         }
         else {
             map[hash] = el;

package/array/mapKey.js

@@ -7,16 +7,17 @@ function mapKey(arr, key, opts = {}) {
     const key_s = key.trim();
     if (key_s.length === 0)
         return {};
-    const OPTS = Object.assign({
+    const OPTS = {
         merge: false,
-    }, Object.prototype.toString.call(opts) === '[object Object]' ? opts : {});
+        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
+    };
     const map = {};
     for (const el of arr) {
         if (Object.prototype.toString.call(el) !== '[object Object]' ||
             !Object.prototype.hasOwnProperty.call(el, key_s))
             continue;
         if (OPTS.merge === true && map.hasOwnProperty(el[key_s])) {
-            map[el[key_s]] = Object.assign(map[el[key_s]], el);
+            map[el[key_s]] = { ...map[el[key_s]], ...el };
         }
         else {
             map[el[key_s]] = el;

package/array/mapPrimitive.js

@@ -4,11 +4,12 @@ const round_1 = require("../number/round");
 function mapPrimitive(arr, opts = {}) {
     if (!Array.isArray(arr) || arr.length === 0)
         return {};
-    const OPTS = Object.assign({
+    const OPTS = {
         valtrim: false,
         valround: false,
         keyround: false,
-    }, Object.prototype.toString.call(opts) === '[object Object]' ? opts : {});
+        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
+    };
     const map = {};
     for (const el of arr) {
         if (typeof el === 'string' && el.trim().length > 0) {

package/array/sort.js

@@ -69,7 +69,7 @@ function sort(arr, by, dir = 'asc', opts = {}) {
                 nokey_arr.push(el);
             }
             else {
-                prepared_arr.push({ t: by(el), el });
+                prepared_arr.push({ t: key, el });
             }
         }
     }
@@ -79,14 +79,23 @@ function sort(arr, by, dir = 'asc', opts = {}) {
     quickSort(prepared_arr);
     if (dir === 'desc')
         prepared_arr.reverse();
+    const result = [];
     if (OPTS.nokey_hide) {
-        return prepared_arr.map(obj => obj.el);
+        for (const obj of prepared_arr)
+            result.push(obj.el);
     }
     else if (OPTS.nokey_atend) {
-        return [...prepared_arr.map(obj => obj.el), ...nokey_arr];
+        for (const obj of prepared_arr)
+            result.push(obj.el);
+        for (const el of nokey_arr)
+            result.push(el);
     }
     else {
-        return [...nokey_arr, ...prepared_arr.map(obj => obj.el)];
+        for (const el of nokey_arr)
+            result.push(el);
+        for (const obj of prepared_arr)
+            result.push(obj.el);
     }
+    return result;
 }
 exports.default = sort;

package/hash/fnv1A.js

@@ -13,7 +13,7 @@ function fnv1A(data, offset = FNV_32) {
         sanitized = data;
     }
     else if (Number.isFinite(data)) {
-        sanitized = `${data}`;
+        sanitized = String(data);
     }
     else if (Array.isArray(data) || Object.prototype.toString.call(data) === '[object Object]') {
         sanitized = JSON.stringify(data);
@@ -22,7 +22,7 @@ function fnv1A(data, offset = FNV_32) {
         sanitized = data.toString();
     }
     else if (data instanceof Date) {
-        sanitized = `${data.getTime()}`;
+        sanitized = String(data.getTime());
     }
     else if (Number.isNaN(data) || data === Infinity) {
         sanitized = REPL_NAN;
@@ -42,7 +42,8 @@ function fnv1A(data, offset = FNV_32) {
     else {
         throw new TypeError('An FNV1A Hash could not be calculated for this datatype');
     }
-    for (let i = 0; i < sanitized.length; i++) {
+    const len = sanitized.length;
+    for (let i = 0; i < len; i++) {
         hash ^= sanitized.charCodeAt(i);
         hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
     }

package/object/merge.js

@@ -1,20 +1,25 @@
 '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');
-    return Object.keys(target).reduce((acc, key) => {
-        if (Object.prototype.toString.call(target[key]) === '[object Object]' &&
-            !Array.isArray(target[key])) {
-            acc[key] = source[key] ? merge(target[key], source[key]) : target[key];
+    const acc = {};
+    for (const key in target) {
+        if (!Object.prototype.hasOwnProperty.call(target, key))
+            continue;
+        if (Object.prototype.toString.call(target[key]) === PROTO_OBJ &&
+            Object.prototype.hasOwnProperty.call(source, key) &&
+            Object.prototype.toString.call(source[key]) === PROTO_OBJ) {
+            acc[key] = merge(target[key], source[key]);
         }
         else {
             acc[key] = Object.prototype.hasOwnProperty.call(source, key)
                 ? source[key]
                 : target[key];
         }
-        return acc;
-    }, {});
+    }
+    return acc;
 }
 exports.default = merge;

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.4.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.6.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" }