@valkyriestudios/utils 12.36.0 → 12.37.0

package/array/mapFnAsMap.js

@@ -15,7 +15,7 @@ function mapFnAsMap(arr, fn, opts) {
         if (Object.prototype.toString.call(el) !== '[object Object]')
             continue;
         const hash = fn(el);
-        if (Number.isFinite(hash) || (typeof hash === 'string' && hash.trim().length)) {
+        if (Number.isFinite(hash) || (typeof hash === 'string' && hash.length > 0)) {
             const transformed = TRANSFORM_FN ? TRANSFORM_FN(el) : el;
             map.set(hash, MERGE && map.has(hash) ? (0, merge_1.merge)(map.get(hash), transformed, { union: true }) : transformed);
         }

package/date/format.js

@@ -17,10 +17,6 @@ try {
 }
 catch {
 }
-finally {
-    if (typeof DEFAULT_TZ !== 'string')
-        DEFAULT_TZ = 'UTC';
-}
 const ESCAPE_RGX = /\[[\s\S]+?]/g;
 const intl_formatters = new LRU_1.default({ max_size: 100 });
 const spec_cache = new LRU_1.default({ max_size: 100 });
@@ -218,9 +214,10 @@ format.getLocale = function () {
     return DEFAULT_LOCALE;
 };
 format.setLocale = function (locale) {
-    if (typeof locale !== 'string' || !locale.trim().length)
+    const normalized = typeof locale === 'string' ? locale.trim() : false;
+    if (!normalized)
         throw new Error('format/setLocale: locale should be a string');
-    DEFAULT_LOCALE = locale.trim();
+    DEFAULT_LOCALE = normalized;
 };
 format.getZone = function () {
     return DEFAULT_TZ;

package/date/isFormat.js

@@ -93,7 +93,7 @@ function compileSpec(spec, is_chunk = false) {
 }
 function isDateFormat(input, spec) {
     if (typeof input !== 'string')
-        throw new TypeError('isDateFormat: input must be a string');
+        return false;
     if (typeof spec !== 'string')
         throw new TypeError('isDateFormat: spec must be a string');
     const { tokens, rgx } = compileSpec(SPEC_ALIASES[spec] || spec);

package/formdata/toObject.d.ts

@@ -11,6 +11,10 @@ type ToObjectConfig = {
      * Whether or not we should normalize booleans, defaults to true if not set
      */
     normalize_bool?: boolean;
+    /**
+     * Whether or not we should normalize null, defaults to true if not set
+     */
+    normalize_null?: boolean;
     /**
      * Whether or not we should normalize dates, defaults to true if not set
      */

package/formdata/toObject.js

@@ -10,22 +10,30 @@ function assign(acc, rawkey, value, single) {
     const keys_len = keys.length;
     for (let i = 0; i < keys_len; i++) {
         const key = keys[i];
-        if (i < (keys_len - 1)) {
-            const n_key = Array.isArray(cursor) ? Number(key) : key;
-            if (!cursor[n_key])
-                cursor[n_key] = Number.isInteger(+keys[i + 1]) ? [] : {};
-            cursor = cursor[n_key];
-        }
-        else if (!(key in cursor) || single.has(key)) {
-            cursor[key] = value;
-        }
-        else {
-            const cursor_val = cursor[key];
-            if (Array.isArray(cursor_val)) {
-                cursor_val.push(value);
-            }
-            else {
-                cursor[key] = [cursor_val, value];
+        switch (key) {
+            case '__proto__':
+            case 'constructor':
+            case 'prototype':
+                return;
+            default: {
+                if (i < (keys_len - 1)) {
+                    const n_key = Array.isArray(cursor) ? Number(key) : key;
+                    if (!cursor[n_key])
+                        cursor[n_key] = Number.isInteger(+keys[i + 1]) ? [] : {};
+                    cursor = cursor[n_key];
+                }
+                else if (!(key in cursor) || (single && single.has(key))) {
+                    cursor[key] = value;
+                }
+                else {
+                    const cursor_val = cursor[key];
+                    if (Array.isArray(cursor_val)) {
+                        cursor_val.push(value);
+                    }
+                    else {
+                        cursor[key] = [cursor_val, value];
+                    }
+                }
             }
         }
     }
@@ -33,38 +41,52 @@ function assign(acc, rawkey, value, single) {
 function toObject(form, config) {
     if (!(form instanceof FormData))
         throw new Error('formdata/toObject: Value is not an instance of FormData');
-    const set = config?.raw === true ? true : new Set(Array.isArray(config?.raw) ? config?.raw : []);
-    const single = new Set(Array.isArray(config?.single) ? config.single : []);
+    const set = config?.raw === true ? null : new Set(Array.isArray(config?.raw) ? config?.raw : []);
+    const set_guard = !!(set && set.size > 0);
+    const single = Array.isArray(config?.single) ? new Set(config.single) : null;
     const nBool = config?.normalize_bool !== false;
+    const nNull = config?.normalize_null !== false;
     const nDate = config?.normalize_date !== false;
     const nNumber = config?.normalize_number !== false;
     const acc = {};
-    form.forEach((value, key) => {
-        if (set !== true && value !== '' && typeof value === 'string' && !set.has(key)) {
-            if (nBool) {
-                switch (value) {
-                    case 'true':
-                    case 'TRUE':
-                    case 'True':
-                        return assign(acc, key, true, single);
-                    case 'false':
-                    case 'FALSE':
-                    case 'False':
-                        return assign(acc, key, false, single);
-                    default:
-                        break;
+    if (set === null) {
+        form.forEach((value, key) => assign(acc, key, value, single));
+    }
+    else {
+        form.forEach((value, key) => {
+            if (set_guard && set.has(key))
+                return assign(acc, key, value, single);
+            switch (value) {
+                case 'true':
+                case 'TRUE':
+                case 'True':
+                    assign(acc, key, nBool ? true : value, single);
+                    break;
+                case 'false':
+                case 'FALSE':
+                case 'False':
+                    assign(acc, key, nBool ? false : value, single);
+                    break;
+                case 'null':
+                case 'NULL':
+                case 'Null':
+                    assign(acc, key, nNull ? null : value, single);
+                    break;
+                default: {
+                    if (typeof value === 'string' && value.length) {
+                        if (nNumber) {
+                            const nVal = Number(value);
+                            if (!isNaN(nVal))
+                                return assign(acc, key, nVal, single);
+                        }
+                        if (nDate &&
+                            (0, isFormat_1.isDateFormat)(value, 'ISO'))
+                            return assign(acc, key, new Date(value), single);
+                    }
+                    assign(acc, key, value, single);
                 }
             }
-            if (nNumber) {
-                const nVal = Number(value);
-                if (!isNaN(nVal))
-                    return assign(acc, key, nVal, single);
-            }
-            if (nDate &&
-                (0, isFormat_1.isDateFormat)(value, 'ISO'))
-                return assign(acc, key, new Date(value), single);
-        }
-        assign(acc, key, value, single);
-    });
+        });
+    }
     return acc;
 }

package/index.d.ts

@@ -284,6 +284,7 @@ declare module "formdata/toObject" {
         raw?: string[] | true;
         single?: string[];
         normalize_bool?: boolean;
+        normalize_null?: boolean;
         normalize_date?: boolean;
         normalize_number?: boolean;
     };

package/object/pick.js

@@ -21,12 +21,12 @@ function pick(obj, keys) {
             const parts_len = parts.length;
             let cursor = map;
             for (let y = 0; y < parts_len - 1; y++) {
-                const part = parts[y].trim();
+                const part = parts[y];
                 if (!(part in cursor))
                     cursor[part] = {};
                 cursor = cursor[part];
             }
-            cursor[parts[parts_len - 1].trim()] = val;
+            cursor[parts[parts_len - 1]] = val;
         }
         else if (key in obj) {
             map[key] = obj[key];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@valkyriestudios/utils",
-    "version": "12.36.0",
+    "version": "12.37.0",
     "description": "A collection of single-function utilities for common tasks",
     "author": {
         "name": "Peter Vermeulen",
@@ -1168,11 +1168,11 @@
         }
     },
     "devDependencies": {
-        "@types/node": "^22.15.16",
+        "@types/node": "^22.15.18",
         "esbuild-register": "^3.6.0",
-        "eslint": "^9.26.0",
+        "eslint": "^9.27.0",
         "nyc": "^17.1.0",
         "typescript": "^5.8.3",
-        "typescript-eslint": "^8.32.0"
+        "typescript-eslint": "^8.32.1"
     }
 }

package/string/humanizeNumber.js

@@ -6,7 +6,7 @@ const round_1 = require("../number/round");
 const DEFAULT_UNITS = ['', 'k', 'm', 'b', 't', 'q'];
 function humanizeNumber(val, options = {}) {
     const DELIM = typeof options?.delim === 'string' ? options.delim : ',';
-    const SEPARATOR = typeof options?.separator === 'string' && options.separator.trim().length ? options.separator : '.';
+    const SEPARATOR = typeof options?.separator === 'string' && options.separator.length ? options.separator : '.';
     const PRECISION = Number.isInteger(options?.precision) && options.precision >= 0 ? options.precision : 2;
     const DIVIDER = Number.isInteger(options?.divider) && options.divider >= 2 ? options.divider : 1000;
     const REAL = options?.real === true;
@@ -15,7 +15,7 @@ function humanizeNumber(val, options = {}) {
         : options?.units === false
             ? false
             : DEFAULT_UNITS;
-    let normalized = typeof val === 'string' ? parseFloat(val.trim()) : val;
+    let normalized = typeof val === 'string' ? parseFloat(val) : val;
     if (!Number.isFinite(normalized) || normalized === 0)
         return UNITS ? '0' + UNITS[0] : '0';
     if (REAL)

package/string/isNotEmpty.js

@@ -5,5 +5,19 @@ exports.default = isNotEmptyString;
 function isNotEmptyString(val, trimmed = true) {
     if (typeof val !== 'string')
         return false;
-    return (trimmed === true ? val.trim() : val).length > 0;
+    if (trimmed) {
+        for (let i = 0; i < val.length; i++) {
+            switch (val[i]) {
+                case ' ':
+                case '\t':
+                case '\n':
+                case '\r':
+                    break;
+                default:
+                    return true;
+            }
+        }
+        return false;
+    }
+    return val.length > 0;
 }

package/string/shorten.js

@@ -17,5 +17,5 @@ function shorten(val, length, postfix = '...', truncate_words = true) {
     while (end && sanitized[end] !== ' ' && sanitized[end - 1] !== ' ') {
         end--;
     }
-    return sanitized.substring(0, end).trim() + postfix;
+    return sanitized.substring(0, end).trimEnd() + postfix;
 }