@valkyriestudios/utils 12.39.0 → 12.41.0

package/README.md

@@ -12,6 +12,11 @@ Zero-dependency collection of single-function utilities for common tasks
 ## Installation
 `npm install @valkyriestudios/utils`
 
+## 🧊 TriFrost is powered by utils
+Many of the utilities in this package are optimized and tested as foundational building blocks of [TriFrost](https://www.trifrost.dev) — a high-performance, type-safe framework for building fullstack TypeScript applications.
+
+If you're looking to go beyond utilities and build fully modular backends with deep type integration, check out TriFrost.
+
 ## Available Functions
 ### array/is(val:unknown)
 Check if a variable is of type Array
@@ -1498,7 +1503,7 @@ pick({a: 1, b: 2, c: 3}, ['a','b']); // {a: 1, b: 2}
 ### object/omit(obj:Object={}, keys:Array[string]=[])
 Returns an object with the keys provided in the keys array stripped from the provided object.
 ```typescript
-import { omit } from "@valkyriestudios/utils/object"; /* Or @valkyriestudios/utils/object/omit; */
+import { omit } from "@valkyriestudios/utils/object";
 const redacted = omit({
     firstName: "Peter",
     lastName: "Vermeulen",
@@ -1519,6 +1524,89 @@ Its type will be
 */
 ```
 
+Also works with wildcards (take note, only as **prefix**):
+```typescript
+import { omit } from "@valkyriestudios/utils/object";
+const redacted = omit({
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    age: 34,
+    details: {
+        phone: "...",
+        email: "...",
+        isActive: true,
+        password: "...",
+    },
+    meta: {
+        phone: "...",
+    },
+}, ["age", "*.phone", "*.email", "*.password"]);
+/**
+Redacted here will be:
+{
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    details: {isActive: true},
+    meta: {}
+}
+*/
+```
+
+### object/scramble(obj:Object={}, keys:Array[string]=[], options?:{replacement?:string})
+Returns an object with the keys provided in the keys array scrambled.
+```typescript
+import { scramble } from "@valkyriestudios/utils/object";
+const redacted = scramble({
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    age: 34,
+    details: {
+        phone: "...",
+        email: "...",
+        isActive: true,
+        password: "...",
+    },
+}, ["age", "details.phone", "details.email", "details.password"]);
+/**
+Redacted here will be:
+{
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    age: "***",
+    details: {phone: "***", email: "***", isActive: true, password: "***"}
+}
+*/
+```
+
+Also works with wildcards (take note, only as **prefix**):
+```typescript
+import { scramble } from "@valkyriestudios/utils/object";
+const redacted = scramble({
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    age: 34,
+    details: {
+        phone: "...",
+        email: "...",
+        isActive: true,
+        password: "...",
+    },
+    meta: {
+        phone: "...",
+    },
+}, ["age", "*.phone", "*.email", "*.password"]);
+/**
+Redacted here will be:
+{
+    firstName: "Peter",
+    lastName: "Vermeulen",
+    age: "***",
+    details: {phone: "***", email: "***", isActive: true, password: "***"},
+    meta: {phone: "***"}
+}
+*/
+```
+
 ### object/merge(target:Object={},obj:Object|Object[]={}, opts?:{union?:boolean})
 Merges two objects together, with the preference over the second object.
 ```typescript

package/cjs/date/format.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 exports.default = format;
 const convertToDate_1 = require("./convertToDate");
+const isFormat_1 = require("./isFormat");
 const LRU_1 = __importDefault(require("../caching/LRU"));
 const WEEK_STARTS = {
     mon: 'mon',
@@ -45,7 +46,7 @@ function toZone(d, zone) {
     const month = d.getUTCMonth();
     const day = d.getUTCDate();
     const time = d.getTime();
-    const daysInMonths = [31, (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    const daysInMonths = (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0) ? isFormat_1.MONTHS_LEAP : isFormat_1.MONTHS;
     let doy = day;
     for (let i = 0; i <= month; i++)
         doy += daysInMonths[i];

package/cjs/date/isFormat.js

@@ -3,25 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MONTHS = exports.MONTHS_LEAP = void 0;
 exports.isDateFormat = isDateFormat;
 exports.default = isDateFormat;
 const LRU_1 = __importDefault(require("../caching/LRU"));
 const SPECIAL_CHARS = /[.*+?^${}()|[\]\\]/g;
 const TOKENS = [
     ['YYYY', /\d{4}/.source, (raw, context) => {
-            context.year = parseInt(raw, 10);
+            context.year = raw | 0;
             return context.year > 0;
         }],
     ['MM', /(?:0[1-9]|1[0-2])/.source, (raw, context) => {
-            context.month = parseInt(raw, 10);
+            context.month = raw | 0;
             return context.month >= 1 && context.month <= 12;
         }],
     ['DD', /(?:0[1-9]|[12][0-9]|3[01])/.source, (raw, context) => {
-            context.day = parseInt(raw, 10);
+            context.day = raw | 0;
             return context.day >= 1 && context.day <= 31;
         }],
     ['HH', /(?:[01][0-9]|2[0-3])/.source, (raw, context) => {
-            context.hour = parseInt(raw, 10);
+            context.hour = raw | 0;
             return context.hour >= 0 && context.hour <= 23;
         }],
     ['mm', /[0-5][0-9]/.source, () => true],
@@ -39,10 +40,10 @@ const TOKENS = [
     ['Z', /Z|[+-](?:0[0-9]|1[0-4]):[0-5][0-9]/.source, raw => {
             if (raw === 'Z')
                 return true;
-            let hour = parseInt(raw[1] + raw[2], 10);
+            let hour = (raw[1] + raw[2]) | 0;
             if (raw[0] === '-')
                 hour = -hour;
-            const minutes = parseInt(raw[4] + raw[5], 10);
+            const minutes = (raw[4] + raw[5]) | 0;
             if (hour === 14 || hour === -12)
                 return minutes === 0;
             return hour >= -11 && hour < 14 && [0, 15, 30, 45].indexOf(minutes) >= 0;
@@ -52,6 +53,13 @@ const SPEC_ALIASES = {
     ISO: 'YYYY-MM-DDTHH:mm:ss{.SSS}Z',
 };
 const spec_pat_cache = new LRU_1.default({ max_size: 100 });
+exports.MONTHS_LEAP = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+exports.MONTHS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+function isValidDay(year, month, day) {
+    return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0)
+        ? day <= exports.MONTHS_LEAP[month - 1]
+        : day <= exports.MONTHS[month - 1];
+}
 function compileSpec(spec, is_chunk = false) {
     let cached = spec_pat_cache.get(spec);
     if (cached !== undefined)
@@ -90,7 +98,7 @@ function compileSpec(spec, is_chunk = false) {
             }
         }
     }
-    cached = { rgx: is_chunk ? RegExp(pat) : RegExp('^' + pat + '$'), tokens };
+    cached = { rgx: is_chunk ? new RegExp(pat) : new RegExp('^' + pat + '$'), tokens };
     spec_pat_cache.set(spec, cached);
     return cached;
 }
@@ -113,11 +121,8 @@ function isDateFormat(input, spec) {
             return false;
     }
     const { is12, day, month, year } = context;
-    if (day && month) {
-        const date = new Date(year || 2024, month - 1, day);
-        if (date.getDate() !== day || date.getMonth() !== month - 1)
-            return false;
-    }
+    if (day && month && !isValidDay(year || 2024, month, day))
+        return false;
     if (is12 && 'hour' in context && context.hour > 11)
         return false;
     return true;

package/cjs/deep/get.js

@@ -21,8 +21,9 @@ function deepGet(obj, path, get_parent = false) {
                 if (!key)
                     break;
                 if (Array.isArray(node)) {
-                    if (!isNaN(Number(key))) {
-                        const ix = parseInt(key, 10);
+                    let ix = Number(key);
+                    if (!isNaN(ix)) {
+                        ix = ix | 0;
                         if (ix < 0 || ix > node.length - 1)
                             return undefined;
                         node = node[ix];
@@ -53,8 +54,9 @@ function deepGet(obj, path, get_parent = false) {
     }
     if (key) {
         if (Array.isArray(node)) {
-            if (!isNaN(Number(key))) {
-                const ix = parseInt(key, 10);
+            let ix = Number(key);
+            if (!isNaN(ix)) {
+                ix = ix | 0;
                 if (ix < 0 || ix > node.length - 1)
                     return undefined;
                 node = node[ix];

package/cjs/formdata/toObject.js

@@ -19,7 +19,7 @@ function assign(acc, rawkey, value, single) {
                 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[n_key] = isNaN(Number(keys[i + 1])) ? {} : [];
                     cursor = cursor[n_key];
                 }
                 else if (!(key in cursor) || (single && single.has(key))) {
@@ -50,12 +50,16 @@ function toObject(form, config) {
     const nNumber = config?.normalize_number !== false;
     const acc = {};
     if (set === null) {
-        form.forEach((value, key) => assign(acc, key, value, single));
+        for (const [key, value] of form) {
+            assign(acc, key, value, single);
+        }
+        return acc;
     }
-    else {
-        form.forEach((value, key) => {
-            if (set_guard && set.has(key))
-                return assign(acc, key, value, single);
+    for (const [key, value] of form) {
+        if (set_guard && set.has(key)) {
+            assign(acc, key, value, single);
+        }
+        else {
             switch (value) {
                 case 'true':
                 case 'TRUE':
@@ -73,20 +77,23 @@ function toObject(form, config) {
                     assign(acc, key, nNull ? null : value, single);
                     break;
                 default: {
-                    if (typeof value === 'string' && value.length) {
+                    if (typeof value === 'string' && value) {
                         if (nNumber) {
                             const nVal = Number(value);
-                            if (!isNaN(nVal))
-                                return assign(acc, key, nVal, single);
+                            if (!isNaN(nVal)) {
+                                assign(acc, key, nVal, single);
+                                continue;
+                            }
+                        }
+                        if (nDate && (0, isFormat_1.isDateFormat)(value, 'ISO')) {
+                            assign(acc, key, new Date(value), single);
+                            continue;
                         }
-                        if (nDate &&
-                            (0, isFormat_1.isDateFormat)(value, 'ISO'))
-                            return assign(acc, key, new Date(value), single);
                     }
                     assign(acc, key, value, single);
                 }
             }
-        });
+        }
     }
     return acc;
 }

package/cjs/modules/Scheduler.js

@@ -36,7 +36,7 @@ function convertPart(part, min, max) {
     const set = new Set();
     if (part.indexOf('/') > -1) {
         const [base, raw_step] = part.split('/', 2);
-        const step = parseInt(raw_step, 10);
+        const step = raw_step | 0;
         let start;
         let end = max;
         if (base === '*') {
@@ -44,29 +44,29 @@ function convertPart(part, min, max) {
         }
         else if (base.indexOf('-') > -1) {
             const chunks = base.split('-', 2);
-            start = parseInt(chunks[0], 10);
-            end = parseInt(chunks[1], 10);
+            start = chunks[0] | 0;
+            end = chunks[1] | 0;
         }
         else {
-            start = parseInt(base, 10);
+            start = base | 0;
         }
         for (let i = start; i <= end; i += step)
             set.add(i);
     }
     else if (part.indexOf('-') > -1) {
         const chunks = part.split('-', 2);
-        const start = parseInt(chunks[0], 10);
-        const end = parseInt(chunks[1], 10);
+        const start = chunks[0] | 0;
+        const end = chunks[1] | 0;
         for (let i = start; i <= end; i++)
             set.add(i);
     }
     else if (part.indexOf(',') > -1) {
         const chunks = part.split(',');
         for (let i = 0; i < chunks.length; i++)
-            set.add(parseInt(chunks[i], 10));
+            set.add(chunks[i] | 0);
     }
     else {
-        set.add(parseInt(part, 10));
+        set.add(part | 0);
     }
     return set;
 }

package/cjs/object/merge.js

@@ -2,33 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.merge = merge;
 exports.default = merge;
-const PROTO_OBJ = '[object Object]';
 function innerMerge(target, source, UNION) {
     const origin = UNION ? source : target;
     for (const key in origin) {
-        const t_key = target[key];
-        const s_key = source[key];
-        if (Object.prototype.toString.call(t_key) === PROTO_OBJ &&
-            Object.prototype.toString.call(s_key) === PROTO_OBJ) {
-            target[key] = innerMerge({ ...t_key }, s_key, UNION);
-        }
-        else {
-            target[key] = s_key !== undefined ? s_key : t_key;
+        const t_val = target[key];
+        const s_val = source[key];
+        if (s_val !== undefined && t_val !== s_val) {
+            target[key] = Object.prototype.toString.call(t_val) === '[object Object]' &&
+                Object.prototype.toString.call(s_val) === '[object Object]'
+                ? innerMerge(t_val, s_val, UNION)
+                : s_val;
         }
     }
     return target;
 }
 function merge(target, source, opts = {}) {
-    if (Object.prototype.toString.call(target) !== PROTO_OBJ)
+    if (Object.prototype.toString.call(target) !== '[object Object]')
         throw new Error('object/merge: Please ensure valid target/source is passed');
     const union = opts?.union === true;
     const sources = Array.isArray(source) ? source : [source];
     let acc = { ...target };
     for (let i = 0; i < sources.length; i++) {
         const el = sources[i];
-        if (!el || Object.prototype.toString.call(el) !== PROTO_OBJ)
-            continue;
-        acc = innerMerge(acc, el, union);
+        if (el &&
+            Object.prototype.toString.call(el) === '[object Object]')
+            acc = innerMerge(acc, el, union);
     }
     return acc;
 }

package/cjs/object/omit.js

@@ -2,32 +2,84 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.omit = omit;
 exports.default = omit;
-function innerOmit(obj, keys) {
-    const result = { ...obj };
-    const groups = {};
-    for (let i = 0; i < keys.length; i++) {
-        if (typeof keys[i] === 'string') {
-            const [root, ...rest] = keys[i].split('.');
-            if (rest.length) {
-                if (!groups[root])
-                    groups[root] = [];
-                groups[root].push(rest.join('.'));
+function wildcardProp(target, source, prop) {
+    if (Array.isArray(target)) {
+        for (let i = 0; i < target.length; i++) {
+            const t = target[i];
+            const s = source[i];
+            if (typeof t === 'object' && t !== null && typeof s === 'object' && s !== null) {
+                if (t === s)
+                    target[i] = { ...t };
+                wildcardProp(target[i], s, prop);
+            }
+        }
+    }
+    else if (Object.prototype.toString.call(target) === '[object Object]') {
+        for (const key in target) {
+            if (key === prop && key in source) {
+                delete target[key];
             }
             else {
-                delete result[root];
+                const val = target[key];
+                const s_val = source?.[key];
+                if (typeof val === 'object' && typeof s_val === 'object' && val !== null && s_val !== null) {
+                    if (val === s_val) {
+                        target[key] = Array.isArray(val) ? [...val] : { ...val };
+                    }
+                    wildcardProp(target[key], s_val, prop);
+                }
+            }
+        }
+    }
+}
+function standardProp(target, source, path) {
+    const last = path.length - 1;
+    for (let i = 0; i < last; i++) {
+        const key = path[i];
+        const val = target[key];
+        const src_val = source?.[key];
+        if (Array.isArray(val)) {
+            target[key] = val.map((item, idx) => {
+                const src_item = src_val[idx];
+                if (Object.prototype.toString.call(item) === '[object Object]') {
+                    const clone = { ...item };
+                    standardProp(clone, src_item, path.slice(i + 1));
+                    return clone;
+                }
+                return item;
+            });
+            return;
+        }
+        if (Object.prototype.toString.call(val) === '[object Object]') {
+            if (val === src_val) {
+                target[key] = { ...val };
             }
+            target = target[key];
+            source = src_val;
+        }
+        else {
+            return;
         }
     }
-    for (const root in groups) {
-        if (typeof result[root] === 'object' &&
-            result[root] !== null)
-            result[root] = innerOmit(result[root], groups[root]);
+    if (target && typeof target === 'object' && path[last] in source) {
+        delete target[path[last]];
     }
-    return result;
 }
 function omit(obj, keys) {
     if (Object.prototype.toString.call(obj) !== '[object Object]' ||
         !Array.isArray(keys))
         throw new TypeError('Please pass an object to omit from and a keys array');
-    return innerOmit(obj, keys);
+    const result = { ...obj };
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (typeof key === 'string') {
+            if (key.length > 2 && key[0] === '*' && key[1] === '.') {
+                wildcardProp(result, obj, key.slice(2));
+            }
+            else {
+                standardProp(result, obj, key.split('.'));
+            }
+        }
+    }
+    return result;
 }

package/cjs/object/scramble.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function wildcardProp(target, source, prop, repl) {
+    if (Array.isArray(target)) {
+        for (let i = 0; i < target.length; i++) {
+            const t = target[i];
+            const s = source[i];
+            if (typeof t === 'object' && t !== null && typeof s === 'object' && s !== null) {
+                if (t === s)
+                    target[i] = { ...t };
+                wildcardProp(target[i], s, prop, repl);
+            }
+        }
+    }
+    else if (Object.prototype.toString.call(target) === '[object Object]') {
+        for (const key in target) {
+            if (key === prop && key in source) {
+                target[key] = repl;
+            }
+            else {
+                const val = target[key];
+                const s_val = source?.[key];
+                if (typeof val === 'object' && typeof s_val === 'object' && val !== null && s_val !== null) {
+                    if (val === s_val) {
+                        target[key] = Array.isArray(val) ? [...val] : { ...val };
+                    }
+                    wildcardProp(target[key], s_val, prop, repl);
+                }
+            }
+        }
+    }
+}
+function standardProp(target, source, path, repl) {
+    const last = path.length - 1;
+    for (let i = 0; i < last; i++) {
+        const key = path[i];
+        const val = target[key];
+        const src_val = source?.[key];
+        if (Array.isArray(val)) {
+            target[key] = val.map((item, idx) => {
+                const src_item = src_val[idx];
+                if (Object.prototype.toString.call(item) === '[object Object]') {
+                    const clone = { ...item };
+                    standardProp(clone, src_item, path.slice(i + 1), repl);
+                    return clone;
+                }
+                return item;
+            });
+            return;
+        }
+        else if (Object.prototype.toString.call(val) === '[object Object]') {
+            if (val === src_val) {
+                target[key] = { ...val };
+            }
+            target = target[key];
+            source = src_val;
+        }
+        else {
+            return;
+        }
+    }
+    if (target && typeof target === 'object' && path[last] in source) {
+        target[path[last]] = repl;
+    }
+}
+function scramble(obj, keys, options) {
+    if (Object.prototype.toString.call(obj) !== '[object Object]' ||
+        !Array.isArray(keys))
+        throw new TypeError('Please pass an object to scramble and a keys array');
+    const repl = typeof options?.replacement === 'string' ? options.replacement : '***';
+    const result = { ...obj };
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (typeof key === 'string') {
+            if (key.length > 2 && key[0] === '*' && key[1] === '.') {
+                wildcardProp(result, obj, key.slice(2), repl);
+            }
+            else {
+                standardProp(result, obj, key.split('.'), repl);
+            }
+        }
+    }
+    return result;
+}
+exports.default = scramble;

package/cjs/object/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/date/isFormat.d.ts

@@ -1,3 +1,5 @@
+export declare const MONTHS_LEAP: number[];
+export declare const MONTHS: number[];
 /**
  * Checks if a given string is in a particular format
  * Eg:

package/esm/date/format.js

@@ -1,4 +1,5 @@
 import { convertToDate } from './convertToDate';
+import { MONTHS, MONTHS_LEAP } from './isFormat';
 import LRU from '../caching/LRU';
 const WEEK_STARTS = {
     mon: 'mon',
@@ -38,7 +39,7 @@ function toZone(d, zone) {
     const month = d.getUTCMonth();
     const day = d.getUTCDate();
     const time = d.getTime();
-    const daysInMonths = [31, (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    const daysInMonths = (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0) ? MONTHS_LEAP : MONTHS;
     let doy = day;
     for (let i = 0; i <= month; i++)
         doy += daysInMonths[i];

package/esm/date/isFormat.js

@@ -2,19 +2,19 @@ import LRU from '../caching/LRU';
 const SPECIAL_CHARS = /[.*+?^${}()|[\]\\]/g;
 const TOKENS = [
     ['YYYY', /\d{4}/.source, (raw, context) => {
-            context.year = parseInt(raw, 10);
+            context.year = raw | 0;
             return context.year > 0;
         }],
     ['MM', /(?:0[1-9]|1[0-2])/.source, (raw, context) => {
-            context.month = parseInt(raw, 10);
+            context.month = raw | 0;
             return context.month >= 1 && context.month <= 12;
         }],
     ['DD', /(?:0[1-9]|[12][0-9]|3[01])/.source, (raw, context) => {
-            context.day = parseInt(raw, 10);
+            context.day = raw | 0;
             return context.day >= 1 && context.day <= 31;
         }],
     ['HH', /(?:[01][0-9]|2[0-3])/.source, (raw, context) => {
-            context.hour = parseInt(raw, 10);
+            context.hour = raw | 0;
             return context.hour >= 0 && context.hour <= 23;
         }],
     ['mm', /[0-5][0-9]/.source, () => true],
@@ -32,10 +32,10 @@ const TOKENS = [
     ['Z', /Z|[+-](?:0[0-9]|1[0-4]):[0-5][0-9]/.source, raw => {
             if (raw === 'Z')
                 return true;
-            let hour = parseInt(raw[1] + raw[2], 10);
+            let hour = (raw[1] + raw[2]) | 0;
             if (raw[0] === '-')
                 hour = -hour;
-            const minutes = parseInt(raw[4] + raw[5], 10);
+            const minutes = (raw[4] + raw[5]) | 0;
             if (hour === 14 || hour === -12)
                 return minutes === 0;
             return hour >= -11 && hour < 14 && [0, 15, 30, 45].indexOf(minutes) >= 0;
@@ -45,6 +45,13 @@ const SPEC_ALIASES = {
     ISO: 'YYYY-MM-DDTHH:mm:ss{.SSS}Z',
 };
 const spec_pat_cache = new LRU({ max_size: 100 });
+export const MONTHS_LEAP = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+export const MONTHS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+function isValidDay(year, month, day) {
+    return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0)
+        ? day <= MONTHS_LEAP[month - 1]
+        : day <= MONTHS[month - 1];
+}
 function compileSpec(spec, is_chunk = false) {
     let cached = spec_pat_cache.get(spec);
     if (cached !== undefined)
@@ -83,7 +90,7 @@ function compileSpec(spec, is_chunk = false) {
             }
         }
     }
-    cached = { rgx: is_chunk ? RegExp(pat) : RegExp('^' + pat + '$'), tokens };
+    cached = { rgx: is_chunk ? new RegExp(pat) : new RegExp('^' + pat + '$'), tokens };
     spec_pat_cache.set(spec, cached);
     return cached;
 }
@@ -106,11 +113,8 @@ function isDateFormat(input, spec) {
             return false;
     }
     const { is12, day, month, year } = context;
-    if (day && month) {
-        const date = new Date(year || 2024, month - 1, day);
-        if (date.getDate() !== day || date.getMonth() !== month - 1)
-            return false;
-    }
+    if (day && month && !isValidDay(year || 2024, month, day))
+        return false;
     if (is12 && 'hour' in context && context.hour > 11)
         return false;
     return true;

package/esm/deep/get.js

@@ -17,8 +17,9 @@ function deepGet(obj, path, get_parent = false) {
                 if (!key)
                     break;
                 if (Array.isArray(node)) {
-                    if (!isNaN(Number(key))) {
-                        const ix = parseInt(key, 10);
+                    let ix = Number(key);
+                    if (!isNaN(ix)) {
+                        ix = ix | 0;
                         if (ix < 0 || ix > node.length - 1)
                             return undefined;
                         node = node[ix];
@@ -49,8 +50,9 @@ function deepGet(obj, path, get_parent = false) {
     }
     if (key) {
         if (Array.isArray(node)) {
-            if (!isNaN(Number(key))) {
-                const ix = parseInt(key, 10);
+            let ix = Number(key);
+            if (!isNaN(ix)) {
+                ix = ix | 0;
                 if (ix < 0 || ix > node.length - 1)
                     return undefined;
                 node = node[ix];

package/esm/formdata/toObject.js

@@ -15,7 +15,7 @@ function assign(acc, rawkey, value, single) {
                 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[n_key] = isNaN(Number(keys[i + 1])) ? {} : [];
                     cursor = cursor[n_key];
                 }
                 else if (!(key in cursor) || (single && single.has(key))) {
@@ -46,12 +46,16 @@ function toObject(form, config) {
     const nNumber = config?.normalize_number !== false;
     const acc = {};
     if (set === null) {
-        form.forEach((value, key) => assign(acc, key, value, single));
+        for (const [key, value] of form) {
+            assign(acc, key, value, single);
+        }
+        return acc;
     }
-    else {
-        form.forEach((value, key) => {
-            if (set_guard && set.has(key))
-                return assign(acc, key, value, single);
+    for (const [key, value] of form) {
+        if (set_guard && set.has(key)) {
+            assign(acc, key, value, single);
+        }
+        else {
             switch (value) {
                 case 'true':
                 case 'TRUE':
@@ -69,20 +73,23 @@ function toObject(form, config) {
                     assign(acc, key, nNull ? null : value, single);
                     break;
                 default: {
-                    if (typeof value === 'string' && value.length) {
+                    if (typeof value === 'string' && value) {
                         if (nNumber) {
                             const nVal = Number(value);
-                            if (!isNaN(nVal))
-                                return assign(acc, key, nVal, single);
+                            if (!isNaN(nVal)) {
+                                assign(acc, key, nVal, single);
+                                continue;
+                            }
+                        }
+                        if (nDate && isDateFormat(value, 'ISO')) {
+                            assign(acc, key, new Date(value), single);
+                            continue;
                         }
-                        if (nDate &&
-                            isDateFormat(value, 'ISO'))
-                            return assign(acc, key, new Date(value), single);
                     }
                     assign(acc, key, value, single);
                 }
             }
-        });
+        }
     }
     return acc;
 }

package/esm/modules/Scheduler.js

@@ -33,7 +33,7 @@ function convertPart(part, min, max) {
     const set = new Set();
     if (part.indexOf('/') > -1) {
         const [base, raw_step] = part.split('/', 2);
-        const step = parseInt(raw_step, 10);
+        const step = raw_step | 0;
         let start;
         let end = max;
         if (base === '*') {
@@ -41,29 +41,29 @@ function convertPart(part, min, max) {
         }
         else if (base.indexOf('-') > -1) {
             const chunks = base.split('-', 2);
-            start = parseInt(chunks[0], 10);
-            end = parseInt(chunks[1], 10);
+            start = chunks[0] | 0;
+            end = chunks[1] | 0;
         }
         else {
-            start = parseInt(base, 10);
+            start = base | 0;
         }
         for (let i = start; i <= end; i += step)
             set.add(i);
     }
     else if (part.indexOf('-') > -1) {
         const chunks = part.split('-', 2);
-        const start = parseInt(chunks[0], 10);
-        const end = parseInt(chunks[1], 10);
+        const start = chunks[0] | 0;
+        const end = chunks[1] | 0;
         for (let i = start; i <= end; i++)
             set.add(i);
     }
     else if (part.indexOf(',') > -1) {
         const chunks = part.split(',');
         for (let i = 0; i < chunks.length; i++)
-            set.add(parseInt(chunks[i], 10));
+            set.add(chunks[i] | 0);
     }
     else {
-        set.add(parseInt(part, 10));
+        set.add(part | 0);
     }
     return set;
 }

package/esm/object/merge.js

@@ -1,30 +1,28 @@
-const PROTO_OBJ = '[object Object]';
 function innerMerge(target, source, UNION) {
     const origin = UNION ? source : target;
     for (const key in origin) {
-        const t_key = target[key];
-        const s_key = source[key];
-        if (Object.prototype.toString.call(t_key) === PROTO_OBJ &&
-            Object.prototype.toString.call(s_key) === PROTO_OBJ) {
-            target[key] = innerMerge({ ...t_key }, s_key, UNION);
-        }
-        else {
-            target[key] = s_key !== undefined ? s_key : t_key;
+        const t_val = target[key];
+        const s_val = source[key];
+        if (s_val !== undefined && t_val !== s_val) {
+            target[key] = Object.prototype.toString.call(t_val) === '[object Object]' &&
+                Object.prototype.toString.call(s_val) === '[object Object]'
+                ? innerMerge(t_val, s_val, UNION)
+                : s_val;
         }
     }
     return target;
 }
 function merge(target, source, opts = {}) {
-    if (Object.prototype.toString.call(target) !== PROTO_OBJ)
+    if (Object.prototype.toString.call(target) !== '[object Object]')
         throw new Error('object/merge: Please ensure valid target/source is passed');
     const union = opts?.union === true;
     const sources = Array.isArray(source) ? source : [source];
     let acc = { ...target };
     for (let i = 0; i < sources.length; i++) {
         const el = sources[i];
-        if (!el || Object.prototype.toString.call(el) !== PROTO_OBJ)
-            continue;
-        acc = innerMerge(acc, el, union);
+        if (el &&
+            Object.prototype.toString.call(el) === '[object Object]')
+            acc = innerMerge(acc, el, union);
     }
     return acc;
 }

package/esm/object/omit.js

@@ -1,30 +1,82 @@
-function innerOmit(obj, keys) {
-    const result = { ...obj };
-    const groups = {};
-    for (let i = 0; i < keys.length; i++) {
-        if (typeof keys[i] === 'string') {
-            const [root, ...rest] = keys[i].split('.');
-            if (rest.length) {
-                if (!groups[root])
-                    groups[root] = [];
-                groups[root].push(rest.join('.'));
+function wildcardProp(target, source, prop) {
+    if (Array.isArray(target)) {
+        for (let i = 0; i < target.length; i++) {
+            const t = target[i];
+            const s = source[i];
+            if (typeof t === 'object' && t !== null && typeof s === 'object' && s !== null) {
+                if (t === s)
+                    target[i] = { ...t };
+                wildcardProp(target[i], s, prop);
+            }
+        }
+    }
+    else if (Object.prototype.toString.call(target) === '[object Object]') {
+        for (const key in target) {
+            if (key === prop && key in source) {
+                delete target[key];
             }
             else {
-                delete result[root];
+                const val = target[key];
+                const s_val = source?.[key];
+                if (typeof val === 'object' && typeof s_val === 'object' && val !== null && s_val !== null) {
+                    if (val === s_val) {
+                        target[key] = Array.isArray(val) ? [...val] : { ...val };
+                    }
+                    wildcardProp(target[key], s_val, prop);
+                }
+            }
+        }
+    }
+}
+function standardProp(target, source, path) {
+    const last = path.length - 1;
+    for (let i = 0; i < last; i++) {
+        const key = path[i];
+        const val = target[key];
+        const src_val = source?.[key];
+        if (Array.isArray(val)) {
+            target[key] = val.map((item, idx) => {
+                const src_item = src_val[idx];
+                if (Object.prototype.toString.call(item) === '[object Object]') {
+                    const clone = { ...item };
+                    standardProp(clone, src_item, path.slice(i + 1));
+                    return clone;
+                }
+                return item;
+            });
+            return;
+        }
+        if (Object.prototype.toString.call(val) === '[object Object]') {
+            if (val === src_val) {
+                target[key] = { ...val };
             }
+            target = target[key];
+            source = src_val;
+        }
+        else {
+            return;
         }
     }
-    for (const root in groups) {
-        if (typeof result[root] === 'object' &&
-            result[root] !== null)
-            result[root] = innerOmit(result[root], groups[root]);
+    if (target && typeof target === 'object' && path[last] in source) {
+        delete target[path[last]];
     }
-    return result;
 }
 function omit(obj, keys) {
     if (Object.prototype.toString.call(obj) !== '[object Object]' ||
         !Array.isArray(keys))
         throw new TypeError('Please pass an object to omit from and a keys array');
-    return innerOmit(obj, keys);
+    const result = { ...obj };
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (typeof key === 'string') {
+            if (key.length > 2 && key[0] === '*' && key[1] === '.') {
+                wildcardProp(result, obj, key.slice(2));
+            }
+            else {
+                standardProp(result, obj, key.split('.'));
+            }
+        }
+    }
+    return result;
 }
 export { omit, omit as default };

package/esm/object/scramble.js

@@ -0,0 +1,83 @@
+function wildcardProp(target, source, prop, repl) {
+    if (Array.isArray(target)) {
+        for (let i = 0; i < target.length; i++) {
+            const t = target[i];
+            const s = source[i];
+            if (typeof t === 'object' && t !== null && typeof s === 'object' && s !== null) {
+                if (t === s)
+                    target[i] = { ...t };
+                wildcardProp(target[i], s, prop, repl);
+            }
+        }
+    }
+    else if (Object.prototype.toString.call(target) === '[object Object]') {
+        for (const key in target) {
+            if (key === prop && key in source) {
+                target[key] = repl;
+            }
+            else {
+                const val = target[key];
+                const s_val = source?.[key];
+                if (typeof val === 'object' && typeof s_val === 'object' && val !== null && s_val !== null) {
+                    if (val === s_val) {
+                        target[key] = Array.isArray(val) ? [...val] : { ...val };
+                    }
+                    wildcardProp(target[key], s_val, prop, repl);
+                }
+            }
+        }
+    }
+}
+function standardProp(target, source, path, repl) {
+    const last = path.length - 1;
+    for (let i = 0; i < last; i++) {
+        const key = path[i];
+        const val = target[key];
+        const src_val = source?.[key];
+        if (Array.isArray(val)) {
+            target[key] = val.map((item, idx) => {
+                const src_item = src_val[idx];
+                if (Object.prototype.toString.call(item) === '[object Object]') {
+                    const clone = { ...item };
+                    standardProp(clone, src_item, path.slice(i + 1), repl);
+                    return clone;
+                }
+                return item;
+            });
+            return;
+        }
+        else if (Object.prototype.toString.call(val) === '[object Object]') {
+            if (val === src_val) {
+                target[key] = { ...val };
+            }
+            target = target[key];
+            source = src_val;
+        }
+        else {
+            return;
+        }
+    }
+    if (target && typeof target === 'object' && path[last] in source) {
+        target[path[last]] = repl;
+    }
+}
+function scramble(obj, keys, options) {
+    if (Object.prototype.toString.call(obj) !== '[object Object]' ||
+        !Array.isArray(keys))
+        throw new TypeError('Please pass an object to scramble and a keys array');
+    const repl = typeof options?.replacement === 'string' ? options.replacement : '***';
+    const result = { ...obj };
+    for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        if (typeof key === 'string') {
+            if (key.length > 2 && key[0] === '*' && key[1] === '.') {
+                wildcardProp(result, obj, key.slice(2), repl);
+            }
+            else {
+                standardProp(result, obj, key.split('.'), repl);
+            }
+        }
+    }
+    return result;
+}
+export default scramble;

package/esm/object/types.js

@@ -0,0 +1 @@
+export {};

package/index.d.ts

@@ -205,6 +205,12 @@ declare module "caching/LRU" {
     }
     export { LRUCache, LRUCache as default };
 }
+declare module "date/isFormat" {
+    export const MONTHS_LEAP: number[];
+    export const MONTHS: number[];
+    function isDateFormat(input: unknown, spec: string): input is string;
+    export { isDateFormat, isDateFormat as default };
+}
 declare module "date/format" {
     const WEEK_STARTS: {
         readonly mon: "mon";
@@ -262,10 +268,6 @@ declare module "date/toUTC" {
     function toUTC(val: Date): Date;
     export { toUTC, toUTC as default };
 }
-declare module "date/isFormat" {
-    function isDateFormat(input: unknown, spec: string): input is string;
-    export { isDateFormat, isDateFormat as default };
-}
 declare module "date/index" {
     export { addUTC } from "date/addUTC";
     export { convertToDate } from "date/convertToDate";
@@ -377,13 +379,25 @@ declare module "deep/get" {
     function deepGet<T extends ObjectType | ArrayType, P extends string>(obj: T, path: P, get_parent?: boolean): DeepGetResult<T, P> | undefined;
     export { deepGet, deepGet as default };
 }
+declare module "object/types" {
+    export type DottedKeys<T> = (T extends Record<string, any> ? {
+        [K in keyof T & string]: T[K] extends Record<string, any> ? K | `${K}.${DottedKeys<T[K]>}` : K;
+    }[keyof T & string] : string) & string;
+    export type DottedKeysWithArray<T> = (T extends Record<string, any> ? {
+        [K in keyof T & string]: T[K] extends (infer U)[] ? U extends Record<string, any> ? K | `${K}.${DottedKeysWithArray<U>}` : K : T[K] extends Record<string, any> ? K | `${K}.${DottedKeysWithArray<T[K]>}` : K;
+    }[keyof T & string] : string) & string;
+    export type ExpandWildcard<T, P extends string> = P extends `*.${infer Key}` ? {
+        [K in keyof T]: T[K] extends Record<string, any> ? `${K & string}.${Key}` : never;
+    }[keyof T] : P;
+    export type ExpandWildcardWithArray<T, P extends string> = P extends `*.${infer Key}` ? {
+        [K in keyof T]: T[K] extends (infer U)[] ? U extends Record<string, any> ? `${K & string}.${Key}` : never : T[K] extends Record<string, any> ? `${K & string}.${Key}` : never;
+    }[keyof T] : P;
+}
 declare module "object/pick" {
+    import { type DottedKeys } from "object/types";
     type ObjectType = {
         [key: string]: any;
     };
-    type DottedKeys<T> = (T extends ObjectType ? {
-        [K in keyof T & string]: T[K] extends ObjectType ? K | `${K}.${DottedKeys<T[K]>}` : K;
-    }[keyof T & string] : string) & string;
     type PickFromObject<T, K extends string> = K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends ObjectType ? {
         [P in Key]: PickFromObject<T[Key], Rest>;
     } : object : object : K extends keyof T ? {
@@ -394,16 +408,11 @@ declare module "object/pick" {
     export { pick, pick as default };
 }
 declare module "object/omit" {
-    type ObjectType = {
-        [key: string]: any;
-    };
-    type DottedKeys<T> = (T extends ObjectType ? {
-        [K in keyof T & string]: T[K] extends ObjectType ? K | `${K}.${DottedKeys<T[K]>}` : K;
-    }[keyof T & string] : string) & string;
-    type OmitFromObject<T, K extends string> = K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends ObjectType ? {
+    import { type DottedKeysWithArray, type ExpandWildcardWithArray } from "object/types";
+    type OmitFromObject<T, K extends string> = T extends (infer U)[] ? OmitFromObject<U, K>[] : T extends Record<string, any> ? K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends Record<string, any> | any[] ? {
         [P in keyof T]: P extends Key ? OmitFromObject<T[Key], Rest> : T[P];
-    } : T : T : Omit<T, K>;
-    function omit<T extends Record<string, any>, K extends readonly DottedKeys<T>[]>(obj: T, keys: K): OmitFromObject<T, K[number]>;
+    } : T : T : Omit<T, K> : T;
+    function omit<T extends Record<string, any>, K extends readonly (DottedKeysWithArray<T> | `*.${string}`)[]>(obj: T, keys: K): OmitFromObject<T, ExpandWildcardWithArray<T, K[number]>>;
     export { omit, omit as default };
 }
 declare module "object/index" {
@@ -775,3 +784,10 @@ declare module "modules/index" {
     export { PubSub } from "modules/PubSub";
     export { Scheduler } from "modules/Scheduler";
 }
+declare module "object/scramble" {
+    import { type DottedKeysWithArray } from "object/types";
+    function scramble<T extends Record<string, any>, K extends readonly (DottedKeysWithArray<T> | `*.${string}`)[]>(obj: T, keys: K, options?: {
+        replacement?: string;
+    }): T;
+    export default scramble;
+}

package/object/omit.d.ts

@@ -1,17 +1,16 @@
-type ObjectType = {
-    [key: string]: any;
-};
-type DottedKeys<T> = (T extends ObjectType ? {
-    [K in keyof T & string]: T[K] extends ObjectType ? K | `${K}.${DottedKeys<T[K]>}` : K;
-}[keyof T & string] : string) & string;
-type OmitFromObject<T, K extends string> = K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends ObjectType ? {
+import { type DottedKeysWithArray, type ExpandWildcardWithArray } from './types';
+type OmitFromObject<T, K extends string> = T extends (infer U)[] ? OmitFromObject<U, K>[] : T extends Record<string, any> ? K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends Record<string, any> | any[] ? {
     [P in keyof T]: P extends Key ? OmitFromObject<T[Key], Rest> : T[P];
-} : T : T : Omit<T, K>;
+} : T : T : Omit<T, K> : T;
 /**
- * Returns a new object with the keys omitted from the passed object, handling nested keys recursively
+ * Returns a new object with the provided keys omitted
+ * Supports:
+ * - omitting keys in nested arrays
+ * - omitting wildcard patterns: '*.password'
+ * - omitting standard keys
  *
  * @param {Record<string, any>} obj - Object to omit from
  * @param {string[]} keys - Array of keys to omit from object
  */
-declare function omit<T extends Record<string, any>, K extends readonly DottedKeys<T>[]>(obj: T, keys: K): OmitFromObject<T, K[number]>;
+declare function omit<T extends Record<string, any>, K extends readonly (DottedKeysWithArray<T> | `*.${string}`)[]>(obj: T, keys: K): OmitFromObject<T, ExpandWildcardWithArray<T, K[number]>>;
 export { omit, omit as default };

package/object/pick.d.ts

@@ -1,9 +1,7 @@
+import { type DottedKeys } from './types';
 type ObjectType = {
     [key: string]: any;
 };
-type DottedKeys<T> = (T extends ObjectType ? {
-    [K in keyof T & string]: T[K] extends ObjectType ? K | `${K}.${DottedKeys<T[K]>}` : K;
-}[keyof T & string] : string) & string;
 type PickFromObject<T, K extends string> = K extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? T[Key] extends ObjectType ? {
     [P in Key]: PickFromObject<T[Key], Rest>;
 } : object : object : K extends keyof T ? {

package/object/scramble.d.ts

@@ -0,0 +1,15 @@
+import { type DottedKeysWithArray } from './types';
+/**
+ * Returns a new object with the provided keys obfuscated
+ * Supports:
+ * - scrambling keys in nested arrays
+ * - scrambling wildcard patterns: '*.password'
+ * - scrambling standard keys
+ *
+ * @param {Record<string, any>} obj - Object to omit from
+ * @param {string[]} keys - Array of keys to omit from object
+ */
+declare function scramble<T extends Record<string, any>, K extends readonly (DottedKeysWithArray<T> | `*.${string}`)[]>(obj: T, keys: K, options?: {
+    replacement?: string;
+}): T;
+export default scramble;

package/object/types.d.ts

@@ -0,0 +1,12 @@
+export type DottedKeys<T> = (T extends Record<string, any> ? {
+    [K in keyof T & string]: T[K] extends Record<string, any> ? K | `${K}.${DottedKeys<T[K]>}` : K;
+}[keyof T & string] : string) & string;
+export type DottedKeysWithArray<T> = (T extends Record<string, any> ? {
+    [K in keyof T & string]: T[K] extends (infer U)[] ? U extends Record<string, any> ? K | `${K}.${DottedKeysWithArray<U>}` : K : T[K] extends Record<string, any> ? K | `${K}.${DottedKeysWithArray<T[K]>}` : K;
+}[keyof T & string] : string) & string;
+export type ExpandWildcard<T, P extends string> = P extends `*.${infer Key}` ? {
+    [K in keyof T]: T[K] extends Record<string, any> ? `${K & string}.${Key}` : never;
+}[keyof T] : P;
+export type ExpandWildcardWithArray<T, P extends string> = P extends `*.${infer Key}` ? {
+    [K in keyof T]: T[K] extends (infer U)[] ? U extends Record<string, any> ? `${K & string}.${Key}` : never : T[K] extends Record<string, any> ? `${K & string}.${Key}` : never;
+}[keyof T] : P;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@valkyriestudios/utils",
-    "version": "12.39.0",
+    "version": "12.41.0",
     "description": "A collection of single-function utilities for common tasks",
     "author": {
         "name": "Peter Vermeulen",
@@ -457,6 +457,11 @@
             "import": "./esm/object/pick.js",
             "require": "./cjs/object/pick.js"
         },
+        "./object/scramble": {
+            "types": "./object/scramble.d.ts",
+            "import": "./esm/object/scramble.js",
+            "require": "./cjs/object/scramble.js"
+        },
         "./regexp": {
             "types": "./regexp/index.d.ts",
             "import": "./esm/regexp/index.js",
@@ -509,12 +514,12 @@
         }
     },
     "devDependencies": {
-        "@types/node": "^22.15.24",
-        "@vitest/coverage-v8": "^3.1.4",
+        "@types/node": "^22.15.30",
+        "@vitest/coverage-v8": "^3.2.2",
         "esbuild-register": "^3.6.0",
-        "eslint": "^9.27.0",
+        "eslint": "^9.28.0",
         "typescript": "^5.8.3",
-        "typescript-eslint": "^8.33.0",
-        "vitest": "^3.1.4"
+        "typescript-eslint": "^8.33.1",
+        "vitest": "^3.2.2"
     }
 }