@valkyriestudios/utils 12.13.0 → 12.15.0

package/array/join.js

@@ -3,27 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.join = join;
 exports.default = join;
 const round_1 = require("../number/round");
-const isInteger_1 = require("../number/isInteger");
+const isIntegerAboveOrEqual_1 = require("../number/isIntegerAboveOrEqual");
 function join(val, opts) {
     if (!Array.isArray(val) || !val.length)
         return '';
-    let DELIM = ' ';
-    let TRIM = true;
-    let VALTRIM = true;
-    let VALROUND = false;
-    let INNERTRIM = false;
-    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
-        if (typeof opts.delim === 'string')
-            DELIM = opts.delim;
-        if (opts.trim === false)
-            TRIM = opts.trim;
-        if (opts.valtrim === false)
-            VALTRIM = false;
-        if (opts.innertrim === true)
-            INNERTRIM = true;
-        if ((0, isInteger_1.isInteger)(opts.valround) && opts.valround >= 0)
-            VALROUND = opts.valround;
-    }
+    const DELIM = typeof opts?.delim === 'string' ? opts.delim : ' ';
+    const TRIM = opts?.trim ?? true;
+    const VALTRIM = opts?.valtrim ?? true;
+    const INNERTRIM = opts?.innertrim ?? false;
+    const VALROUND = (0, isIntegerAboveOrEqual_1.isIntegerAboveOrEqual)(opts?.valround, 0) ? opts.valround : false;
     let result = '';
     for (let i = 0; i < val.length; i++) {
         const el = val[i];

package/array/sort.d.ts

@@ -1,9 +1,9 @@
-interface sortOptions {
+type sortOptions<T> = {
     /**
      * Filter function to apply to the array before sorting
      * (default=isNotEmptyObject)
      */
-    filter_fn?: (el: any) => boolean;
+    filter_fn?: (el: T) => boolean;
     /**
      * Remove objects that don't have the key or where the key is falsy
      * (default=false)
@@ -14,7 +14,7 @@ interface sortOptions {
      * (default=true)
      */
     nokey_atend?: boolean;
-}
+};
 type sortByFunction = (el: Record<string, any>) => string;
 /**
  * Sort an array of objects.
@@ -60,5 +60,5 @@ type sortByFunction = (el: Record<string, any>) => string;
  */
 declare function sort<T extends {
     [key: string]: any;
-}[]>(arr: T, by: string | sortByFunction, dir?: 'asc' | 'desc', opts?: sortOptions): T;
+}[]>(arr: T, by: string | sortByFunction, dir?: 'asc' | 'desc', opts?: sortOptions<T>): T;
 export { sort, sort as default };

package/array/sort.js

@@ -58,33 +58,39 @@ function sort(arr, by, dir = 'asc', opts) {
         const fn = opts.filter_fn;
         FILTER_FN = (el => (0, isNotEmpty_1.isNotEmptyObject)(el) && fn(el));
     }
-    let getKey;
+    const prepared_arr = [];
+    const nokey_arr = [];
     if (typeof by === 'string') {
         const by_s = by.trim();
         if (!by_s.length)
             throw new Error('Sort by as string should contain content');
-        getKey = (el) => el[by_s];
+        for (const el of arr) {
+            if (!FILTER_FN(el))
+                continue;
+            if (el?.[by_s] === undefined) {
+                nokey_arr.push(el);
+            }
+            else {
+                prepared_arr.push([el[by_s], el]);
+            }
+        }
     }
     else if (typeof by === 'function') {
-        getKey = by;
+        for (const el of arr) {
+            if (!FILTER_FN(el))
+                continue;
+            const key = by(el);
+            if (key === undefined) {
+                nokey_arr.push(el);
+            }
+            else {
+                prepared_arr.push([key, el]);
+            }
+        }
     }
     else {
         throw new Error('Sort by should either be a string with content or a function');
     }
-    const prepared_arr = [];
-    const nokey_arr = [];
-    for (let i = 0; i < arr.length; i++) {
-        const el = arr[i];
-        if (!FILTER_FN(el))
-            continue;
-        const key = getKey(el);
-        if (key === undefined) {
-            nokey_arr.push(el);
-        }
-        else {
-            prepared_arr.push([key, el]);
-        }
-    }
     quickSort(prepared_arr);
     if (dir === 'desc')
         prepared_arr.reverse();

package/index.d.ts

@@ -26,9 +26,9 @@ declare module "number/round" {
     function round(val: number, precision?: number): number;
     export { round, round as default };
 }
-declare module "number/isInteger" {
-    function isInteger(val: unknown): val is number;
-    export { isInteger, isInteger as default };
+declare module "number/isIntegerAboveOrEqual" {
+    function isIntegerAboveOrEqual(val: unknown, ref: number): val is number;
+    export { isIntegerAboveOrEqual, isIntegerAboveOrEqual as default };
 }
 declare module "array/join" {
     interface joinOptions {
@@ -56,10 +56,6 @@ declare module "array/mapKey" {
     function mapKey<T extends Record<string, any>>(arr: T[], key: string, opts?: mapOptions): Record<string, T>;
     export { mapKey, mapKey as default };
 }
-declare module "number/isIntegerAboveOrEqual" {
-    function isIntegerAboveOrEqual(val: unknown, ref: number): val is number;
-    export { isIntegerAboveOrEqual, isIntegerAboveOrEqual as default };
-}
 declare module "array/mapPrimitive" {
     interface mapOptions {
         valtrim?: boolean;
@@ -86,15 +82,15 @@ declare module "array/shuffle" {
     export { shuffle, shuffle as default };
 }
 declare module "array/sort" {
-    interface sortOptions {
-        filter_fn?: (el: any) => boolean;
+    type sortOptions<T> = {
+        filter_fn?: (el: T) => boolean;
         nokey_hide?: boolean;
         nokey_atend?: boolean;
-    }
+    };
     type sortByFunction = (el: Record<string, any>) => string;
     function sort<T extends {
         [key: string]: any;
-    }[]>(arr: T, by: string | sortByFunction, dir?: 'asc' | 'desc', opts?: sortOptions): T;
+    }[]>(arr: T, by: string | sortByFunction, dir?: 'asc' | 'desc', opts?: sortOptions<T>): T;
     export { sort, sort as default };
 }
 declare module "array/index" {
@@ -322,6 +318,10 @@ declare module "number/isBetween" {
     function isNumberBetween(val: unknown, min: number, max: number): val is number;
     export { isNumberBetween, isNumberBetween as default };
 }
+declare module "number/isInteger" {
+    function isInteger(val: unknown): val is number;
+    export { isInteger, isInteger as default };
+}
 declare module "number/isIntegerAbove" {
     function isIntegerAbove(val: unknown, ref: number): val is number;
     export { isIntegerAbove, isIntegerAbove as default };

package/package.json

@@ -1 +1 @@
-{ "name": "@valkyriestudios/utils", "version": "12.13.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.15.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" }

package/string/humanizeNumber.js

@@ -34,10 +34,13 @@ function humanizeNumber(val, options = {}) {
         }
     }
     const humanized = `${(0, round_1.round)(normalized, PRECISION)}`.split('.', 2);
-    humanized[0] = humanized[0].split('').reverse().map((char, ix, original) => {
-        if (ix > 0 && ix < original.length && ix % 3 === 0)
-            return char + DELIM;
-        return char;
-    }).reverse().join('');
-    return `${sign}${humanized.join(SEPARATOR)}${UNITS ? UNITS[unit_ix] : ''}`;
+    const integerPart = humanized[0];
+    let formattedIntegerPart = '';
+    for (let i = 0; i < integerPart.length; i++) {
+        if (i > 0 && (integerPart.length - i) % 3 === 0) {
+            formattedIntegerPart += DELIM;
+        }
+        formattedIntegerPart += integerPart[i];
+    }
+    return `${sign}${formattedIntegerPart}${humanized[1] ? SEPARATOR + humanized[1] : ''}${UNITS ? UNITS[unit_ix] : ''}`;
 }